OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 1190614529 -s ours
authorBill Yi <byi@google.com>
Tue, 13 Jun 2017 02:35:18 +0000 (02:35 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Jun 2017 02:35:18 +0000 (02:35 +0000)
commitcd3e39fb2121993726f9b7331d4f4240527b9772
tree45522cce935f3a9053b1634660d1803b551cc2e6
parent5aa7ecc26b10191cad3700f2a62273d8a39d3ff8
parent47bb41b1bb3c8a31598d9ba1ec40b4bbb304ef3f
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 1190614529  -s ours
am: 47bb41b1bb  -s ours

Change-Id: I12c93763e3ab6bb471c9e7049789fdc2e65406e4