Automatic translation import

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

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

Change-Id: Iaf6c4bec7e2e65794d37cb4a54f17daea67c7c8e