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:09:31 +0000 (18:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 5 Aug 2016 18:09:31 +0000 (18:09 +0000)
commit6b1d586689b224ecc75f0050903d8cbbb6df146d
tree8bdc9e5eedefcfb44ee6e87c13faf300a3512016
parent69f9855f4ee9f4625f3d632a17a4eea6ed7f5169
parentd82970fa794be4268d9c91f536a0fa287c9a1af3
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 3849360867  -s ours
am: d82970fa79  -s ours

Change-Id: I8c72e5a743d2d06c4839c02c5993e9cf6a5ef5eb