OSDN Git Service

[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
authorBill Yi <byi@google.com>
Mon, 16 Apr 2018 22:14:49 +0000 (15:14 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 16 Apr 2018 22:14:49 +0000 (15:14 -0700)
am: f99a4a3e06  -s ours

Change-Id: Iea1d0a1bc534e1a50349782ab856013176a7ca66


Trivial merge