OSDN Git Service

[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
authorBill Yi <byi@google.com>
Mon, 2 Apr 2018 18:22:53 +0000 (18:22 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 2 Apr 2018 18:22:53 +0000 (18:22 +0000)
commitd8222560d66fea3cf7069297392c81ce6ffe69fc
tree601a47961a90a7804baf30a9a2d34b815b4e6963
parent6e5e0f58873d26d7bf833db30c92e7c2c1c7367e
parent46b20b4e18622ad7f086f36bc6b0555507852014
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: 46b20b4e18  -s ours

Change-Id: Iff28e2792dafb0ed15eb975c0ac0bc2c3599ba15