Automatic translation import

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

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

Change-Id: Ia1c169d5cb199049c940dd4fb0f789157ee9be0b