Camera button support: fix another ^C^V fail

Yes, that was merged way too fast...

Change-Id: I88243887446876de39e79020e6d8fecc6351bdde
Merge "Camera button support: fix another ^C^V fail" into cm-10.2
Remove ON/OFF toggles in Settings for Bluetooth, Wifi and Profiles

Change-Id: I600bc603d35e9bff8eedcf43d3fa1e532beeaf8f
Integrate Performance Control

Change-Id: I9802cf199ce3022872fb23a03685c0e592d502fc
Android Studio Support

Change-Id: I5a139c58acb74482b3d0d4c011a75ef23e1fde63
Add Active Display (2/2)

Change-Id: I48505d92340b05e8592f7068da7e7aef1326b2a4
Add setting for Vold Switchable Pair (2/2)

This will be hidden unless the device has non-emulated internal storage
and an external SD, in which case persist.sys.vold.switchablepair will be
set automaticaly.  This does away with the need for ro.vold.switchablepair
to be set in the build.prop.

Change-Id: Id83fc90d771ca3a7179f2c50d0ae828eb3dbaa9f

Conflicts:
	res/values/cm_strings.xml
Revamp Custom Settings

Change-Id: Ib551ad001ecb0b251ec3fc4a0156653adec460f9
Use internal cache if getExternalCacheDir returns null

Change-Id: Iaadc13aeac75df07b1a3b17cca4e87dc17f06fe0
settings: Battery bar (1/2)

Change-Id: I3356efc5fe8fa6cfda1db009a068fcd2dfd72a1f
Add network usage stats to status bar. [2/2]

Change-Id: Iccf6d4b6dc5af30c8814661081048281b688387b
 Active display: allow hiding low priority notifications. [2/2]

Change-Id: Idcf573a43bdb27a8416ea11d2bd92410deaf63a0
Add Breathing Notifications for Call and SMS (2/2)

Change-Id: I3b6d5310236a9de18d6e0e9ca1846281f3a2f306
Add always open QuickSettings (1/2)

Change-Id: I0571069834d900f059680dab1365a83291ef2665
Add gesture based lockscreen security. [2/2]

PS2:
Tidy things up a bit.

Change-Id: I83e3ab643e19b2a2d9c8416f4925bbab05bbc896
Add Halo (1/2)

Change-Id: I935772f516c57b82650aaa63012770b861cb5693