OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-dev am: 7905adb795 -s ours am...
authorBill Yi <byi@google.com>
Fri, 5 Aug 2016 18:04:09 +0000 (18:04 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 5 Aug 2016 18:04:09 +0000 (18:04 +0000)
am: cf2a88659a  -s ours

Change-Id: Ife217d29abf048044cd81c36a7a1df21e46e24bd


Trivial merge