OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
authorBill Yi <byi@google.com>
Wed, 2 Aug 2017 15:30:44 +0000 (15:30 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 2 Aug 2017 15:30:44 +0000 (15:30 +0000)
commit2ef5de5dda7a0bb73ba53aacf3ff7a5b03011e9e
tree14ce210bc726dcd0c61e0b2b949a8999305fb444
parent7a8c6a39f594e2351aac3f64b8a823850b6e73cc
parente5ae77c67908a7274620f9ee5e14b4bccd5e4c10
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: e5ae77c679  -s ours

Change-Id: I40363a8dfa67eeb76bcef16a239a753582e94edd