OSDN Git Service

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

Change-Id: Ibb74eb19844dfe8bc0348ee095202a2703cc3e28


Trivial merge