OSDN Git Service

[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
authorBill Yi <byi@google.com>
Mon, 21 May 2018 18:11:36 +0000 (11:11 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 21 May 2018 18:11:36 +0000 (11:11 -0700)
commit06d509f6422e3d2f28211cf5cd894148cf9b5faf
treec88104592b53ad3669f6b6e312af3e711ebe7c35
parent370e6da71ac1fd4246a3d9c9ea2c9feac44509d5
parentaddcc20dd46dad23885416db5b2a4172d2652889
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: addcc20dd4  -s ours

Change-Id: Id0247616a981fcc59b0956bf0ba29f0e96d7980a