OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: c95d9b29e2 -s ours
authorBill Yi <byi@google.com>
Fri, 26 Jan 2018 21:29:22 +0000 (21:29 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 26 Jan 2018 21:29:22 +0000 (21:29 +0000)
commit75bd78f903fd3b9cb5809da0ca5a33a005948117
tree0087a26f7ccbf6769d38aac2097e2256f2767d52
parent6fd79513f3a8e4fcae0521c0787c08905eac77ee
parent6331bfd20963d2da0f22db439d1efea79248ea3e
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: c95d9b29e2  -s ours
am: 6331bfd209  -s ours

Change-Id: I23147707ca5e2349d9a86a1e8042d14b1495ec9d