OSDN Git Service

Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: 60858a45cd -s...
authorBill Yi <byi@google.com>
Thu, 21 Jul 2016 03:48:12 +0000 (03:48 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 21 Jul 2016 03:48:12 +0000 (03:48 +0000)
am: db8b36970c  -s ours

Change-Id: I14d90c58dc1d04ac5ffc48ec92e015dfeae37f3c


Trivial merge