OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: ccd9ff6157 -s ours
authorBill Yi <byi@google.com>
Fri, 12 Aug 2016 10:58:14 +0000 (10:58 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 12 Aug 2016 10:58:14 +0000 (10:58 +0000)
commit71bc49552445b115efd513b4286e5798e8b734c3
tree4636300d89a3901ef80da8b87db3d2c28626f270
parent00a748e8bf8e5b9f7588fda03dc1fa821501c744
parentd4d3503d57f69fb9e98b2538141f7fb481539eb1
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: ccd9ff6157  -s ours
am: d4d3503d57  -s ours

Change-Id: I328576af4b4f006176a98fe8279e44803bb80432