tree 9a8f65cf0e21300e1dd6018fbf97dc520010dcb6
parent 47bb41b1bb3c8a31598d9ba1ec40b4bbb304ef3f
parent 34cfd78f8e7a4aca7d56761ebf00b64ec6d6cff7
author Bill Yi <byi@google.com> 1497321509 +0000
committer android-build-merger <android-build-merger@google.com> 1497321509 +0000

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 34cfd78f8e  -s ours

Change-Id: Iccdd50aca254ad54a1c34ec3dd1d37d494f04f7f