OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 420ae05329 -s ours
authorBill Yi <byi@google.com>
Sat, 16 Sep 2017 21:24:54 +0000 (21:24 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 16 Sep 2017 21:24:54 +0000 (21:24 +0000)
commite43596160c18c2eba0147e4a3b4f3f7208691df6
tree8dac9a42d7e98e4a1a7093c7f7bf0d6a214fb9d6
parent743945015dd22b644ee884e7baf88202c24085f0
parent52ff2bf2a1c07170ee7a32a4c931a403a85febd5
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 420ae05329  -s ours
am: 52ff2bf2a1  -s ours

Change-Id: I0384a49cb23e1f48509582e71909f7245482ec15