OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev am: f0bdfbc508 -s ours
authorBill Yi <byi@google.com>
Sat, 17 Jun 2017 06:16:42 +0000 (06:16 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 17 Jun 2017 06:16:42 +0000 (06:16 +0000)
commit74facaef64d8fbdf8672d86b5471ff226050a48e
treeeda0576faf9642cc05be8e09575b7fec0c3f1ec7
parent7790c15c2473a03afd9a5ed913cfb401dc81c620
parentdee1ecf9df44cd741946532c0d434069218d8f30
Merge "Import translations. DO NOT MERGE" into oc-dev am: f0bdfbc508  -s ours
am: dee1ecf9df  -s ours

Change-Id: I135d93838a61fad0211b23aaf5b3b48ef40926b5