OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 4b7b89b9a1 -s ours
authorBill Yi <byi@google.com>
Fri, 26 Jan 2018 21:27:49 +0000 (21:27 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 26 Jan 2018 21:27:49 +0000 (21:27 +0000)
commit6fd79513f3a8e4fcae0521c0787c08905eac77ee
tree0087a26f7ccbf6769d38aac2097e2256f2767d52
parent1a274e092a0e509f2f1f67e7aca401b71c54c9ff
parent9be01e02589715a7377998df9ebb8ad3b4883aae
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 4b7b89b9a1  -s ours
am: 9be01e0258  -s ours

Change-Id: I63bad0555c9ab4959e2fb073597de93d7477f0e8