OSDN Git Service

Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: e3c1d48dc0...
authorBill Yi <byi@google.com>
Fri, 14 Oct 2016 09:22:27 +0000 (09:22 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 14 Oct 2016 09:22:27 +0000 (09:22 +0000)
am: c4c7942ee2  -s ours

Change-Id: I4600e0f79e4d068607e8c210b2a10559ae557cbb


Trivial merge