OSDN Git Service

[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: da6cff...
authorBill Yi <byi@google.com>
Mon, 2 Apr 2018 20:48:09 +0000 (20:48 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 2 Apr 2018 20:48:09 +0000 (20:48 +0000)
am: 7c2c6f36e6  -s ours

Change-Id: I83105881a3b70bcb7c04c9cae1dd8aa4a001d055


Trivial merge