tree 9840b0eb750ae54cea08f93170f8069bc79e7577
parent 49a6ff1e75d7082f3786412e7390656a4261829e
parent 8e39c4499d49ddb87eff5986cfc92146705d6527
author Bill Yi <byi@google.com> 1471074203 +0000
committer android-build-merger <android-build-merger@google.com> 1471074203 +0000

Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 8e39c4499d  -s ours

Change-Id: Iace132d56c0aac76a884cbcd06a1e4a60e094791