tree c687fb1ed10c2d9bca3206b7385d2fec5fc70fdc
parent 9a048d5b5bafad2f8bbf607d03c7bd6ecb487d7e
parent 33192787cea46dc0ea50483fe9055bc39c063751
author Bill Yi <byi@google.com> 1500743131 +0000
committer android-build-merger <android-build-merger@google.com> 1500743131 +0000

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: 33192787ce  -s ours

Change-Id: I2b5f30a86e62d6f8158da6d359dc27615f719e3d