OSDN Git Service

Merge \"Import translations. DO NOT MERGE\" into nyc-dev
authorBill Yi <byi@google.com>
Thu, 9 Jun 2016 14:22:06 +0000 (14:22 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 9 Jun 2016 14:22:06 +0000 (14:22 +0000)
am: 972b902171  -s ours

Change-Id: I83cbeb9a2398fdecc3f45f108e25258a53448bcd


Trivial merge