OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev am: 242c3c497c -s ours
authorBill Yi <byi@google.com>
Thu, 22 Jun 2017 13:47:47 +0000 (13:47 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 22 Jun 2017 13:47:47 +0000 (13:47 +0000)
commit58df3f4b2e6a8b8a1d2944ab4461e5a6b208dccf
tree1fa6669d44ca78cff009d06ba9ed36dc51e7be07
parent53988d9f8dc3656f4b7ecae75168fcb8da0bd1e1
parent70c2a7b0d99e14a4760bea6522a1f30055ae3b91
Merge "Import translations. DO NOT MERGE" into oc-dev am: 242c3c497c  -s ours
am: 70c2a7b0d9  -s ours

Change-Id: I6559d4e1d46cd96e4c40a01c789b58cc41069b88