OSDN Git Service

[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 481f84...
authorBill Yi <byi@google.com>
Thu, 24 May 2018 00:53:10 +0000 (17:53 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 24 May 2018 00:53:10 +0000 (17:53 -0700)
am: d460cc4963  -s ours

Change-Id: I0d0514a010d45ac6715d2b3fbe175291d4d73a29


Trivial merge