OSDN Git Service

Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 3849360867 -s ours...
authorBill Yi <byi@google.com>
Fri, 5 Aug 2016 18:12:31 +0000 (18:12 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 5 Aug 2016 18:12:31 +0000 (18:12 +0000)
am: 08ae967b48  -s ours

Change-Id: I4a07ec4681f1b00b9a0bf3660d091265b8d4fe5f


Trivial merge