OSDN Git Service

[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
authorBill Yi <byi@google.com>
Tue, 16 Oct 2018 13:45:48 +0000 (06:45 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 16 Oct 2018 13:45:48 +0000 (06:45 -0700)
commit6cb353100bc6207d5984a53cd9c1cb910c131dfe
tree90bf7040ea7b039dbd9bcb82f55fa87b635a302d
parent62e971732c44c9fe7d921caddd6d26410403cb4e
parentb2ae8c0c91154cf24ce4e8c0e5b4a442ed40e22b
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: b2ae8c0c91  -s ours

Change-Id: I88584708530bc563afd004eec2449cf696104f05