OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev am: b4e8cad186 -s ours
authorBill Yi <byi@google.com>
Wed, 26 Jul 2017 08:19:41 +0000 (08:19 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 26 Jul 2017 08:19:41 +0000 (08:19 +0000)
commit74ebff61b0ea0469390d6cab55a0b90c112f7b58
tree096424997f422b24a2175f5cc25ab14e56a498d1
parent816a4d38de8105852e3e7ad80a0c08d4c140ace1
parent0ad45f6f7661c8a5ad3e053559713c78e9176020
Merge "Import translations. DO NOT MERGE" into oc-dev am: b4e8cad186  -s ours
am: 0ad45f6f76  -s ours

Change-Id: I95efa84b8030ee19fd38e900466dadf0348cb309