OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: b978569fce -s ours...
authorBill Yi <byi@google.com>
Wed, 26 Jul 2017 20:07:42 +0000 (20:07 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 26 Jul 2017 20:07:42 +0000 (20:07 +0000)
commit6c2793ef7416438e5b7229d44280a08e1f0f69a0
treedd86b772664f4583bc5fa1082819f48aa4023d38
parent6a5910680d8eca3225155a6574e35a9a5eef0fcc
parentc13544434b58cf56ebfdbd55ecbb4fa755ba7cae
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: b978569fce  -s ours am: 60ebd52445  -s ours
am: c13544434b  -s ours

Change-Id: Ic4ae2673dcafa9e5c292ec704a017e98e8f1de9c