Automatic translation import

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

Conflicts:
	res/values-fr/cm_strings.xml
	res/values-zh-rHK/cm_strings.xml
	res/values-zh-rTW/cm_strings.xml

Change-Id: I9e0d149c8e65f2d2d3016a5ab14b4bd56a3c1d5f