OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
authorBill Yi <byi@google.com>
Sat, 22 Jul 2017 17:15:14 +0000 (17:15 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 22 Jul 2017 17:15:14 +0000 (17:15 +0000)
commit0412212ef1817c17fecfc4ec16d52f0ea99b6df7
treec687fb1ed10c2d9bca3206b7385d2fec5fc70fdc
parentcaef97c5c80c31727e3229eed37b67be8436a99a
parent7c1b73eab7dee83295bcdcd914118afa490ab193
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: 7c1b73eab7  -s ours

Change-Id: I75374adc93f550c55e2d67e4464c304db95a8d7e