Camera button support: fix FC

Fixed a typo in xml which caused Settings FC.

Change-Id: I0c01d03cc8effde9d8422e091a7389dcbb59ffa5
Status bar clock size option

Change-Id: Iaa70406173bf1c9b85ad12f3759aa963a1ed98a8
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2
Merge remote-tracking branch 'sgt7/cm-10.2' into cm-10.2-sgt7

Conflicts:
	res/values/cm_strings.xml