OSDN Git Service

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

Change-Id: I17a1beb48aad1e8744ecfab50791267ee972b971


Trivial merge