OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-dev
authorBill Yi <byi@google.com>
Tue, 7 Jun 2016 03:31:23 +0000 (03:31 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 7 Jun 2016 03:31:23 +0000 (03:31 +0000)
am: 48229d7781  -s ours

* commit '48229d77817bbf4c169787bef8faddd77bf890a1':
  Import translations. DO NOT MERGE

Change-Id: I736dc40ed3a5ba94a145779a30ab8e21b1ee601a


Trivial merge