Automatic translation import

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

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

Change-Id: I0a92559f2e53a3e1a11e108b50974f5d5429ef74