tree 3fa234475eaccbffb3dad2349e094f9196cdc201
parent 283ae559a27249b6dd2b8cbef16ce7258e701ed6
parent c1e05bd541236f4f9ca5db3d4544e4f21d1e2c2d
author Bill Yi <byi@google.com> 1505595430 +0000
committer android-build-merger <android-build-merger@google.com> 1505595430 +0000

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

Change-Id: Ifa3fc1fa882eca341bda49a1af0bb57be0b92aa0