Automatic translation import

Change-Id: I3d5d55aee9a93dca4d3818e89c01a48a526d49fa
Merge branch 'cm-11.0' into kk_mkt

Conflicts:
	res/values-zh-rCN/cm_arrays.xml
	res/values-zh-rCN/cm_strings.xml

Change-Id: Iec60d7ae8a63ae52dafb7f645584417088838f30