OSDN Git Service

Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
authorBill Yi <byi@google.com>
Tue, 12 Jul 2016 16:27:38 +0000 (16:27 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 12 Jul 2016 16:27:38 +0000 (16:27 +0000)
am: a8b4e7320a  -s ours

Change-Id: Ia3155124b7367bfec936160db2ce5fbc14ae6cb1


Trivial merge