OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 56b37be1c9 -s ours
authorBill Yi <byi@google.com>
Wed, 26 Jul 2017 18:36:02 +0000 (18:36 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 26 Jul 2017 18:36:02 +0000 (18:36 +0000)
commitd43d9e5dc1d88281f0ad5753a6c11317f108ed24
tree4fb4147ab884e56832ce2bca928eebb0735aea49
parent42ce0994f191efd9727fa0cd288753fd93161967
parent1b8c5efd897fb840c4f095fcd44d416154c3d341
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 56b37be1c9  -s ours
am: 1b8c5efd89  -s ours

Change-Id: Ib684060ce289b3410ed2fa43f5c7fdd596e2c468