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 19:06:15 +0000 (19:06 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 26 Jul 2017 19:06:15 +0000 (19:06 +0000)
commitfdcaf8272445cee53ca1be751b31d50f6b67af0a
treeea27c0a92c033195001ac6c061a56fdf88708abd
parentc13544434b58cf56ebfdbd55ecbb4fa755ba7cae
parent6cb150d094b526d5f05c11efd83be833c0ca4d0d
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: b978569fce  -s ours
am: 6cb150d094  -s ours

Change-Id: Id5b0e0588628c151b384107ecc0e4a6fe4236917