OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 5ce01c13e5 -s ours
authorBill Yi <byi@google.com>
Sun, 5 Jun 2016 16:01:08 +0000 (16:01 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sun, 5 Jun 2016 16:01:08 +0000 (16:01 +0000)
am: 2a3857a810  -s ours

* commit '2a3857a810442487fdca0991c62257a1ccc7546a':
  Import translations. DO NOT MERGE

Change-Id: Iaec3abf0329383857492b56b4614e25881d4c8d7


Trivial merge