tree 4522b11f5eb50d46834eeedc063d3389c68178cb
parent c3b38d1374f85030769df902653c45686230beec
parent 0bc96a736a1a8392f8a8bccd12c14bbf78b8f784
author Bill Yi <byi@google.com> 1461718507 +0000
committer android-build-merger <android-build-merger@google.com> 1461718507 +0000

Import translations. DO NOT MERGE am: ca5003e  -s ours am: e84e73a  -s ours
am: 0bc96a7  -s ours

* commit '0bc96a736a1a8392f8a8bccd12c14bbf78b8f784':
  Import translations. DO NOT MERGE

Change-Id: I6c61e5ca179a1598ee2f630c87dc5caef87f6047