Automatic translation import

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

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

Change-Id: I712b2852941495e9dabd84cf34ea9ac845d2706f