OSDN Git Service

[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
authorBill Yi <byi@google.com>
Mon, 21 May 2018 18:32:41 +0000 (11:32 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 21 May 2018 18:32:41 +0000 (11:32 -0700)
commit491a78548b34fc4220780b8cd0583c1ccc695668
tree85faf6f3bb3a3996d372acbf621192da9b027aff
parent1c015160c62fc11f6c8d3a4c47f3e9fa13fe212c
parent346e04785d8549c104f2950347725db71dff4a75
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: 346e04785d  -s ours

Change-Id: I6f15d6341bd4574d65dd9c0eb08fc80482386beb