OSDN Git Service

Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
authorBill Yi <byi@google.com>
Tue, 19 Jul 2016 09:53:07 +0000 (09:53 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 19 Jul 2016 09:53:07 +0000 (09:53 +0000)
am: 5fa976b741  -s ours

Change-Id: Ifa08ba7af9b6ffd58c95cdc1bbc40638b8433748


Trivial merge