OSDN Git Service

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

* commit 'c52adeb73f1dc992fd9771b9c80f5209dd0f7a64':
  Import translations. DO NOT MERGE

Change-Id: Iec2abf34165c65d077037928387150688f64420d


Trivial merge