OSDN Git Service

[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 3812f1...
authorandroid-build-team Robot <android-build-team-robot@google.com>
Tue, 8 May 2018 19:19:26 +0000 (12:19 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 8 May 2018 19:19:26 +0000 (12:19 -0700)
am: 2dd241f540  -s ours

Change-Id: Id00cfac904f82740eb3a2584b5e641a1c71cbd82


Trivial merge