tree 6a43c27bf5372f43e8946cc495942e4b6f4b5594
parent 48b987e19863cab660b1ec90681d67808fac41ab
parent 60570b3cc252ad887784f5ebf44947e74e5c2bcc
author Bill Yi <byi@google.com> 1491123950 +0000
committer android-build-merger <android-build-merger@google.com> 1491123950 +0000

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: f13c6c2a4c  -s ours am: 4fd00b9756  -s ours
am: 60570b3cc2  -s ours

Change-Id: I2ca7a40a6510c7a2c3efe8e0e093a3b300a32c03