Automatic translation import

Change-Id: Icec3191b83587c6e25dae78080ba0808cd2f0bf6
Merge remote-tracking branch 'cm/cm-11.0' into HEAD

Conflicts:
	res/values-es/plurals.xml
	res/values-es/strings.xml

Change-Id: I75fcdb917f5f4aa20b1f531e692e48f017c2469a