OSDN Git Service

Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
authorBill Yi <byi@google.com>
Thu, 21 Jul 2016 03:42:29 +0000 (03:42 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 21 Jul 2016 03:42:29 +0000 (03:42 +0000)
am: 50fd9a9ca4  -s ours

Change-Id: I92bcafd93bb2c1fe1818415b2f991fd677101dea


Trivial merge