OSDN Git Service

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

Change-Id: I2a14c3144042b5a90febd68b95c5c97e3dfde0e4


Trivial merge