tree f322cffc34a308ea79efba088369dc8c39b3f6cd
parent ab470dbf297c06330991fc3b9dcc9f5b6117b15b
parent ff4daca6123d8955814b78a66de7973f7ffdbc75
author Bill Yi <byi@google.com> 1522704666 +0000
committer android-build-merger <android-build-merger@google.com> 1522704666 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: ff4daca612  -s ours

Change-Id: I90c83ec8ef40cab730481551b3342d7acc7fc66f