OSDN Git Service

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

Change-Id: I909f8334846a92370d136722d1aa8eaa1aa162ca


Trivial merge