Automatic translation import

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

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

Change-Id: I444d5256279807b2467114d8f1a327e342624f37