OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
authorBill Yi <byi@google.com>
Tue, 25 Jul 2017 22:42:01 +0000 (22:42 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 25 Jul 2017 22:42:01 +0000 (22:42 +0000)
commitb79a16029a40ec30220aca3e8f3c837bf4807be7
tree6743cd5e4af187976051b2f29bd64d50e6feb33b
parent9509a0f3ead7b680db293c09d5b3cbb78320d7b6
parentf969869726f227f4c2fce7f0e29275be5a90e86c
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: f969869726  -s ours

Change-Id: I11b516cc23ae3714a6c75d937bdb6a24a772c255