OSDN Git Service

Merge \"Import translations. DO NOT MERGE\" into nyc-dev
authorBill Yi <byi@google.com>
Thu, 9 Jun 2016 13:57:21 +0000 (13:57 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 9 Jun 2016 13:57:21 +0000 (13:57 +0000)
am: 648c1112a6  -s ours

Change-Id: I798d6deb0c5d3c9e395fd31e1d5b1402aca79912


Trivial merge