OSDN Git Service

[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
authorBill Yi <byi@google.com>
Mon, 2 Apr 2018 18:23:35 +0000 (18:23 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 2 Apr 2018 18:23:35 +0000 (18:23 +0000)
am: 38dccc3fff  -s ours

Change-Id: I9239d12a182a41dcb5db4a33f2b8fdac5aef5763


Trivial merge