tree 71b74f73ee83ead341cd3035de763bd8f1a474db
parent 430ad959853cf053c317ad256b8613e05d29f5fe
parent b197cd85a6d3b91f9b8e429187dbf8382b064209
author Bill Yi <byi@google.com> 1466138917 +0000
committer android-build-merger <android-build-merger@google.com> 1466138917 +0000

Merge \"Import translations. DO NOT MERGE\" into stage-aosp-master
am: b197cd85a6  -s ours

Change-Id: I02065195a90cbedb96abafe734cd4d4ce2295022