Automatic translation import 

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

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

Change-Id: Idb6584ac7d0b9a497f765c2e32e01232191cabf0