OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
authorBill Yi <byi@google.com>
Thu, 1 Sep 2016 06:45:28 +0000 (06:45 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 1 Sep 2016 06:45:28 +0000 (06:45 +0000)
am: 6030f64a58  -s ours

Change-Id: Ib9c3da80b8e9ed49d7d765299a0ff53d345f0cc9


Trivial merge