Automatic translation import

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

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

Change-Id: Ic454932b663f31ad3b0c094b5bf389ea2d356157