Automatic translation import

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

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

Change-Id: If566b0ba427bc016dd66a9183ab03e992d2e0c63