OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 4ecc9d2db4 -s ours
authorBill Yi <byi@google.com>
Fri, 19 Aug 2016 15:42:53 +0000 (15:42 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 19 Aug 2016 15:42:53 +0000 (15:42 +0000)
am: e35215cec7  -s ours

Change-Id: I76e05f0850240a1b39ade0ad8c9e20dd60a51f64


Trivial merge