Automatic translation import 

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

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

Change-Id: I4265d87eef9ca37b6306d676cbbe1ab061d71486