OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
authorBill Yi <byi@google.com>
Sat, 17 Jun 2017 11:36:22 +0000 (11:36 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 17 Jun 2017 11:36:22 +0000 (11:36 +0000)
commit96e57619af1599d88619b0cf96701635a033c7d8
treeeda0576faf9642cc05be8e09575b7fec0c3f1ec7
parentbabf652e62643fdc03f7b0a05ed9139f7a0cfb75
parent3a759c93b810103528e91958d4fc9ac47d948707
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 3a759c93b8  -s ours

Change-Id: Ib4197d83ce8733ae25f2a091d9622dc47205817f