OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
authorBill Yi <byi@google.com>
Fri, 3 Jun 2016 17:23:35 +0000 (17:23 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 3 Jun 2016 17:23:35 +0000 (17:23 +0000)
am: 7d84e110cb  -s ours

* commit '7d84e110cb7a6012a7cebb40a41198b36d129446':
  Import translations. DO NOT MERGE

Change-Id: I562c0bc2db023fe46e04dfccac0588a84b4067ba


Trivial merge