OSDN Git Service

Merge "Import translations. DO NOT MERGE am: b4f16b10af -s ours am: e7527d1334 ...
authorBill Yi <byi@google.com>
Thu, 24 Aug 2017 08:15:23 +0000 (08:15 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 24 Aug 2017 08:15:23 +0000 (08:15 +0000)
commit99f37420b247fa94911b07bdfcb6ea7496603ecb
tree6f2e1a68c673631236b9e5b3ac0a3318bd9f63de
parent7c2bb3af00c1123a17b3b2e9b5376a9506f2c25d
parent16bead770ec0e14511cc45642b0cbae6f0357307
Merge "Import translations. DO NOT MERGE am: b4f16b10af  -s ours am: e7527d1334  -s ours" into oc-mr1-dev-plus-aosp
am: 16bead770e  -s ours

Change-Id: I54b6025846fa5f52d3a321da165ca7685c147526