OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 28abd94074 -s ours
authorBill Yi <byi@google.com>
Fri, 26 Jan 2018 21:20:37 +0000 (21:20 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 26 Jan 2018 21:20:37 +0000 (21:20 +0000)
commit5c906e6acead9a1313b6ab8cde580bdfdc398565
tree0087a26f7ccbf6769d38aac2097e2256f2767d52
parent1db967243dfbeb7ecdba201e260afca26fa4b8c3
parent130f1a6b5e6aeec183996f7a78c67c1f9157d941
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 28abd94074  -s ours
am: 130f1a6b5e  -s ours

Change-Id: I2a87a73363d9e665db8616e320a08e487187a487