tree 76b698675afe63da9ab46c2a2b22b97b2a216279
parent 31ddf15a4287fcc631c51180812ce0014d59f56c
parent 429e38cacbde7a89323c75b2f5af03044b7e73a1
author Bill Yi <byi@google.com> 1499792288 +0000
committer android-build-merger <android-build-merger@google.com> 1499792288 +0000

Merge "Import translations. DO NOT MERGE" into oc-dev am: 69fe3e4678  -s ours
am: 429e38cacb  -s ours

Change-Id: I7eda9f6f71407ba93c05cdfcc5c07d879ad3e00d