Automatic translation import 

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

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

Change-Id: I66aa8c97d448139cefc04292eb9a87300a8fd752