OSDN Git Service

[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
authorandroid-build-team Robot <android-build-team-robot@google.com>
Mon, 7 May 2018 06:00:20 +0000 (23:00 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 7 May 2018 06:00:20 +0000 (23:00 -0700)
am: 7b6247f7a3  -s ours

Change-Id: If8bb311453375f50f8276608e5b2dc8de5cdca3b


Trivial merge