Automatic translation import

Change-Id: I88325e998e1134bb4df88a1ad943a040546555a3
Merge remote-tracking branch 'cm/cm-11.0' into HEAD

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

Change-Id: If68fda21212ec683666d9de89deb6f043bfc12c0