Revert "Fix coding style."

This reverts commit 42b1727b5268363659ea1d8843452a33dc1f7c7b.

Change-Id: Ie8feb9dba61ce5cc263e4b09e063e0cd00ecdbe9
Revert "Bluetooth : Remove out of range devices after ScanComplete"

Reverting this change as it has some side effects and after
removing this gerrit the behavior is like commercial phone.

This reverts commit 2ba08f2d7efbfe7c0b0080f0e9a63e56d15695e7.

Change-Id: Ice89ccb6250f55f4e0235df27a3ecea64260b488
Merge "Revert "Fix coding style."" into cm-10.2
Merge "Revert "Bluetooth : Remove out of range devices after ScanComplete"" into cm-10.2
Settings: ES translations

- SEAndroid

Change-Id: I48cd9d93b868ee47db69f03c7d677eb48e382091
HALO (2/2)

Change-Id: Ic09b4ee9b42cd4373771831f3e56b2e25adae67e

Conflicts:
	src/com/android/settings/applications/InstalledAppDetails.java

Conflicts:
	res/values/cm_strings.xml
Transparent Statusbar Settings

Change-Id: I62fdf5c009bc05fc061b4591cf75f31f7a89538d

Conflicts:
	res/values/strings.xml
HALO Size (2/2)

Change-Id: I382312a697ef7a51525cacba5fa6ec8d6e99e29d
HALO: Option to pause the underlying app (2/2)
- adds an option to pause the active app when using HALO
- this is enabled by default for devices with low memory
- (currently: <640MB RAM available to the kernel)

Change-Id: I9ed009f06713b2f26560980223d17d7b8b125186
Fix bugs / Build fixes

Change-Id: I264943718cd4671ba2bbb550ab42cc2997d6799f
Advanced reboot enabled by default (2/2)

Change-Id: I1fc9a2f1303ff5455ba0930b97c0b551000546e6
Make Fullscreen_StatusBar switchable (2/2)

Change-Id: I451d320adbecdd8542e636fdd0321522ef6b6edb

Conflicts:
	res/values/cm_strings.xml
Fullscreen Statusbar Pulldown Timeout (2/2)

Change-Id: I5b727f4c415607dd7884a4105cf1a1c7e9dbf71e
Transparent Navigation Bar (2/2)

Change-Id: I025e33e680ed73475e9c517d285a91bc11c520c6
Settings: MediaScanner behavior on boot (3/3)

Change-Id: If5f76a851b92b30abbf192b57857e32612fe32ca
disable camera sounds (1/3)

Change-Id: I9c61ac497cac1af1cc8771317ada059a417b4c03
Status bar Auto-Hide (2/2)

Change-Id: I3362244591866bd7b9db22f3449ac42a96590d70

Conflicts:
	res/values/cm_strings.xml
	res/xml/status_bar.xml
	src/com/android/settings/cyanogenmod/StatusBar.java
Settings: Specify notification types for Auto Hide statusbar (2/2)

Change-Id: I8d626999af55ce70af7dd3949049220af7bd2947

Conflicts:
	res/xml/status_bar.xml
	src/com/android/settings/cyanogenmod/StatusBar.java
App sidebar (2/2)

Change-Id: I9aae5e80960e5037e7aa69019004d4dda91f282a
Quick Settings: Option to use floating window (2/2)

Allows the option of launching preferences from the quicksettings menu in a
floating window

Change-Id: I00237f6b667d35f0e8d2cf8201f4efee6adf762c