Automatic translation import

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

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

Change-Id: Ida7fd3f5033cdf2d89517bfb344235bd51e9688c