Automatic translation import

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

Conflicts:
	res/values-fr/strings.xml

Change-Id: Id5b5b8df8000f575d3944aa37c34fde13aa43398