OSDN Git Service

[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
authorBill Yi <byi@google.com>
Tue, 17 Apr 2018 14:45:49 +0000 (07:45 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 17 Apr 2018 14:45:49 +0000 (07:45 -0700)
commit96a11f19248b69cc517440693b81c85ab7e835db
treec3931527c4b015ec6c0fbb648b62a533a283b2d9
parent7bb51a834e4a5468c4935e2a9d6743e5a2061dda
parent452e2470e7c37f6e82d47ba3685b9d6582f99bc7
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: 452e2470e7  -s ours

Change-Id: I86288693999346747ffff6db158d4e82aaee5d01