OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-dr1-dev
authorBill Yi <byi@google.com>
Sat, 17 Sep 2016 19:45:12 +0000 (19:45 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 17 Sep 2016 19:45:12 +0000 (19:45 +0000)
am: f17adb2180  -s ours

Change-Id: I54f70a75b501b5a79c7a32eea04936eab045aab8


Trivial merge