OSDN Git Service

Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 54d4aa374f -s ours
authorBill Yi <byi@google.com>
Fri, 5 Aug 2016 17:42:30 +0000 (17:42 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 5 Aug 2016 17:42:30 +0000 (17:42 +0000)
am: e71889a282  -s ours

Change-Id: Ifa7d47227938a35e1b784bff4155618324d65d73


Trivial merge