Automatic translation import

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

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

Change-Id: I7845d158b7dde98237294c403f2171268b3f317a