OSDN Git Service

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

Change-Id: I52e26bf5c881a67547da4828ac19d2b4cfb30d77


Trivial merge