Automatic translation import

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

Conflicts:
	res/values-ca/cm_strings.xml

Change-Id: Ib8e52ef5dca570c37b4b99cd08f767bad5065f6b