OSDN Git Service

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

Change-Id: Ia217a988e8816741bca4a04ba2a27c7e09eaf249


Trivial merge