Automatic translation import

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

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

Change-Id: I2193e223312e8e597ed9b02853bd8eb5f235ca5f