OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-dev
authorBill Yi <byi@google.com>
Fri, 3 Jun 2016 17:59:06 +0000 (17:59 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 3 Jun 2016 17:59:06 +0000 (17:59 +0000)
commit6c4a3962e7090451da516c56a6da0b3c816e046d
tree808860d8a26062a46308fdbec5e39d1cea3c3544
parent564dc9d0f7ef869a61b8825d844d7812fdb6f058
parent93bc210b3f9e9a86074080324162b3a66cac104c
Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 93bc210b3f  -s ours

* commit '93bc210b3f9e9a86074080324162b3a66cac104c':
  Import translations. DO NOT MERGE

Change-Id: Ia8b0a47a38207e1d2c85f97f0e771281512d1e9c