Automatic translation import

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

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

Change-Id: Ic8bdd7c4f993866d5b0910ed1c35495f994de0c5