Automatic translation import

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

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

Change-Id: Icc1feeb20514e0e4e435d5934948e4188c819a62