OSDN Git Service

Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
authorBill Yi <byi@google.com>
Tue, 12 Jul 2016 16:27:41 +0000 (16:27 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 12 Jul 2016 16:27:41 +0000 (16:27 +0000)
am: 86f7155e6f  -s ours

Change-Id: I93d1e66cc995a91f51bca4bb2aaf42554170a527


Trivial merge