OSDN Git Service

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

Change-Id: Icd099d9f43a84b36e46b6febcd88998b9f6bf573


Trivial merge