OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-dev am: cace07e727 -s ours
authorBill Yi <byi@google.com>
Fri, 3 Jun 2016 17:13:01 +0000 (17:13 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 3 Jun 2016 17:13:01 +0000 (17:13 +0000)
commit83680a1c3dc8aad2f7990279a1bf951cce215c5c
tree8d7e5311c0b596c5abecd47fa8c19d9f757cfdb1
parent711de8ebe818f57aafeaa3382f5ed377783fb098
parent479f70c5167806d916bceb7f241227f90ccd3242
Merge "Import translations. DO NOT MERGE" into nyc-dev am: cace07e727  -s ours
am: 479f70c516  -s ours

* commit '479f70c5167806d916bceb7f241227f90ccd3242':
  Import translations. DO NOT MERGE

Change-Id: I122d411f09df424963f85f9c75b2f2abec92456e