OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
authorBill Yi <byi@google.com>
Thu, 17 Aug 2017 15:40:43 +0000 (15:40 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 17 Aug 2017 15:40:43 +0000 (15:40 +0000)
commit7189b42b4ec1dc7238f9c70599b18b6a8c72521d
tree9e1303861acd16d62f47411f091aa90685f24963
parentf8817000ac6b54ae933b177a481ad8203b427492
parent682ff5562c709723ba9f90b4870a3700fc6d314c
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: 682ff5562c  -s ours

Change-Id: I862ac0ee9e44ab52838a797892d5cfe28a576a15