OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
authorBill Yi <byi@google.com>
Fri, 26 Jan 2018 21:05:30 +0000 (21:05 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 26 Jan 2018 21:05:30 +0000 (21:05 +0000)
commit130f1a6b5e6aeec183996f7a78c67c1f9157d941
tree6eabf8ba0608a0a5669a02e2b9e8fac368cba203
parenteeb9fba09d763eea6bb8fa1da8a30d63ad650989
parent28abd94074c8ce28fffc5f0328330718627a6910
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: 28abd94074  -s ours

Change-Id: I94d247f60e399547e4418859a014d2c48ac35674