OSDN Git Service

[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
authorBill Yi <byi@google.com>
Fri, 1 Jun 2018 11:53:17 +0000 (04:53 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 1 Jun 2018 11:53:17 +0000 (04:53 -0700)
commit2aa9dc1174c8de2d251b31704e0aa073ced2a698
tree167a2534adf992474332a228a3118c4e0ee55fdf
parent91368ac791d9f2a05fb04e3af8c44135667b4bab
parenta70ada7ebda0a49f87d6afb8fb23643ec8dab1cd
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: a70ada7ebd  -s ours

Change-Id: I60e1afeade49ea7180987d7c67674c98ad3502a2