OSDN Git Service

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

Change-Id: Ic4a89d91d818afef84c1335b23a6ddd2c8cd4aab


Trivial merge