OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-dev
authorBill Yi <byi@google.com>
Mon, 23 May 2016 16:03:23 +0000 (16:03 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 23 May 2016 16:03:23 +0000 (16:03 +0000)
commit0b9b896202b58db23a2cdb21bc59cfe1bc1137a0
tree63fdd967ed38f5c341c892494206a297c4ee38db
parentddf050723952a4e83da26cae506f47e70dd50380
parent05be3b454134afc73ae44cda88af10bead5324a6
Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 05be3b4541  -s ours

* commit '05be3b454134afc73ae44cda88af10bead5324a6':
  Import translations. DO NOT MERGE

Change-Id: Ibdb1ab97fd2995e507cec35a52a30063e91c5ff9