OSDN Git Service

Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
authorBill Yi <byi@google.com>
Fri, 22 Jul 2016 02:13:25 +0000 (02:13 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 22 Jul 2016 02:13:25 +0000 (02:13 +0000)
am: d6498d1120  -s ours

Change-Id: I40a278fefe8891467e6b7e3f01a1f18514b85fb0


Trivial merge