OSDN Git Service

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 41912188e5 -s ours
authorBill Yi <byi@google.com>
Thu, 27 Oct 2016 05:21:38 +0000 (05:21 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 27 Oct 2016 05:21:38 +0000 (05:21 +0000)
commit1ef4b78ca3c3e79592e52aa31bd2a2d9969ac28d
tree3bd0b376a6b583489378d108231b636734318a62
parent7abc47da4196ec296f0e019e26ea11aed804ea05
parentf0a5ebb1296afe09fd7e75b50f97531e73d0668c
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 41912188e5  -s ours
am: f0a5ebb129  -s ours

Change-Id: Ia8d103f423f72e3a32005f3f2c424ae2adac0ab3