OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
authorBill Yi <byi@google.com>
Fri, 26 Jan 2018 21:02:47 +0000 (21:02 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 26 Jan 2018 21:02:47 +0000 (21:02 +0000)
commiteeb9fba09d763eea6bb8fa1da8a30d63ad650989
tree6eabf8ba0608a0a5669a02e2b9e8fac368cba203
parent0a56ce8d2f51413b48e95d474d6c2f622f801d12
parent178e861e6e605bd643c7bbae7be5441f15fe0d57
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: 178e861e6e  -s ours

Change-Id: I44734403eba503fe12eb094e11998d01e6ebf084