OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
authorBill Yi <byi@google.com>
Sat, 16 Sep 2017 20:50:00 +0000 (20:50 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 16 Sep 2017 20:50:00 +0000 (20:50 +0000)
commite43dfbad3bd949649d826609f00b288bf673c247
tree3e46baeaf405392a309783de68c3a4be3e9e149a
parent2e3be621b670313f65867edf596e6f30ca3dd4b9
parent9b4683842d200a059cbff21f661a01a8f6a92c34
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: 9b4683842d  -s ours

Change-Id: I181876ca8f124875296af5c91d90788d44e6e690