OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev
authorBill Yi <byi@google.com>
Tue, 13 Jun 2017 00:27:05 +0000 (00:27 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Jun 2017 00:27:05 +0000 (00:27 +0000)
commit5a3998fe38b4249ca45f883153618bf772b8581a
treee1c3c8aa29485b571d988121020e0e08477d3dd6
parent938fe5c96853bb45c35fdf59272f1d571b5257cd
parent7c2a12b658160ae98705c54d60117d7914ef58fc
Merge "Import translations. DO NOT MERGE" into oc-dev
am: 7c2a12b658  -s ours

Change-Id: I5f257f746717037d275e025c80581d1f4cccc67d