OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev
authorBill Yi <byi@google.com>
Wed, 26 Jul 2017 08:02:03 +0000 (08:02 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 26 Jul 2017 08:02:03 +0000 (08:02 +0000)
commit5bbc5fe52165cb897836b508a1929b4a7492a2b0
treec1e960668ec9fa035561a8f4791f8c3b7491dd84
parentdcb5e77673c4f2a759422d2bf21c2b7265998098
parentb4e8cad18618325c8891046c8f7dbb54507c9c18
Merge "Import translations. DO NOT MERGE" into oc-dev
am: b4e8cad186  -s ours

Change-Id: I5c909bf0c13581379f08f21394c1c3221944c93e