Merge "Frameworks/base: FR translation" into cm-10.2
Conflicts:
	core/res/res/values-fr/cm_strings.xml

Change-Id: Iebc48cc1331dd8b4cf97ff71044e35ada43d0ae0