OSDN Git Service

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 0bf8ae56ff -s ours
authorBill Yi <byi@google.com>
Thu, 10 Nov 2016 14:41:42 +0000 (14:41 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 10 Nov 2016 14:41:42 +0000 (14:41 +0000)
commitf9c19c20222754523dba106d3d28ba8f963758b5
tree365a98f2d189afe1812ed320da1dcba3a41b48c2
parentdca4571f892d6175e02f4a7e1502e6a464d84362
parent221c05e6d154f6e06297f924b8f20a6e18c1248c
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 0bf8ae56ff  -s ours
am: 221c05e6d1  -s ours

Change-Id: I15d5908cbf02847651321cea840c10666aa1c245