OSDN Git Service

[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: ae73c8...
authorBill Yi <byi@google.com>
Mon, 2 Apr 2018 21:26:18 +0000 (21:26 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 2 Apr 2018 21:26:18 +0000 (21:26 +0000)
am: 316ecebd70  -s ours

Change-Id: I11aa3efcabcafb98a3142454bdb33a669bef25a1


Trivial merge