OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-dev
authorBill Yi <byi@google.com>
Mon, 25 Apr 2016 15:15:42 +0000 (15:15 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 25 Apr 2016 15:15:42 +0000 (15:15 +0000)
am: 779722d  -s ours

* commit '779722d7ed84aa0d7a03a3aec93690de9c3dcb7c':
  Import translations. DO NOT MERGE

Change-Id: I39eea7741f07a090ee8aa03919c5456b68a01b5f


Trivial merge