OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
authorBill Yi <byi@google.com>
Fri, 26 Jan 2018 20:59:57 +0000 (20:59 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 26 Jan 2018 20:59:57 +0000 (20:59 +0000)
commit0a56ce8d2f51413b48e95d474d6c2f622f801d12
tree6eabf8ba0608a0a5669a02e2b9e8fac368cba203
parent43f511a92829f8ff756756f51b64af195c026a8c
parent9531d0fd0bf12dd2468b27e1d7c2ae63d89da6c5
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: 9531d0fd0b  -s ours

Change-Id: I74d6220a3ec75c941b31cb4bef960dc21aa4bade