Automatic translation import

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

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

Change-Id: Ib11f55721dc13505017586d0045012c4d3847248