OSDN Git Service

Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
authorBill Yi <byi@google.com>
Mon, 27 Jun 2016 17:38:42 +0000 (17:38 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 27 Jun 2016 17:38:42 +0000 (17:38 +0000)
am: ee32cd8cd6  -s ours

Change-Id: I4f5b370c10e7c5fee36c780a41b3c64d7c268dce


Trivial merge