OSDN Git Service

[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 9a1d31...
authorandroid-build-team Robot <android-build-team-robot@google.com>
Wed, 9 May 2018 04:09:12 +0000 (21:09 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 9 May 2018 04:09:12 +0000 (21:09 -0700)
am: 09df358bd8  -s ours

Change-Id: Iaa228298b45bc1686cc07faa22c65e0062d8d25d


Trivial merge