Add toggle colors and Colorpicker

Change-Id: I58f97bb80cfdd321ff7abc44bab0778f2c6ed764
Add Internal Slim version string
This can be accessed in any app using

- android.os.Build.VERSION.SLIM

and corresponds to

- ro.slim.version in build.prop

Change-Id: Ife7dc54f3da0d27b2f389078e206d17f1ffccc95
Add slim version string

Change-Id: I0be8c72e437881e83cdb5dba53243545c4f12978
Merge branch 'jb4.2' of git://github.com/SlimRoms/frameworks_base into jb4.2

Conflicts:
	core/java/android/provider/Settings.java

Change-Id: Ib66574f1a3feee06824d0402d9f260f8c7e8c089
Add overlays to fix Dock Audio for legacy devices

Change-Id: Ifa434022a445de3827ed79e680c756c9e6008c67
Merge branch 'jb.42' into jb4.2
Finally fix dock audio for infuse

Change-Id: I32d54d5b7573ecc34e722aa0610dbbb3d778d03f
Finally fix dock audio for infuse

Change-Id: I32d54d5b7573ecc34e722aa0610dbbb3d778d03f

Conflicts:
	core/res/res/values/config.xml
Merge branch 'master' into jb4.2

Conflicts:
	core/res/res/values/config.xml

Change-Id: I88e20fc4b91f3b77cfbf7da4f4f9bba3d1b53781
Fix Logical error

Change-Id: I0450bf9fd3871ec1b8ab7b46616f614600522594
audio: Add overlay to fix analog docks.

Of particular interest to devices using libhardware_legacy and
affected by commit 5a484b753cc72d6a50c1dd3bbf68b3403c741a3a: http://goo.gl/rVR1Z
which restricted the routing of AUDIO_DEVICE_OUT_ANLG_DOCK_HEADSET
to docks using FORCE_ANALOG_DOCK cases. The EXTRA_DOCK_STATE_CAR case is
returning FORCE_BT_CAR_DOCK, preventing the dock audio from routing properly.

Add an overlay option for overriding to FORCE_ANALOG_DOCK.

Change-Id: Ib7d70c242aa6f537ea5d65098ceb2c591662d8bb

Conflicts:
	core/res/res/values/config.xml
	media/java/android/media/AudioService.java
audio: Add overlay to fix analog docks.

Of particular interest to devices using libhardware_legacy and
affected by commit 5a484b753cc72d6a50c1dd3bbf68b3403c741a3a: http://goo.gl/rVR1Z
which restricted the routing of AUDIO_DEVICE_OUT_ANLG_DOCK_HEADSET
to docks using FORCE_ANALOG_DOCK cases. The EXTRA_DOCK_STATE_CAR case is
returning FORCE_BT_CAR_DOCK, preventing the dock audio from routing properly.

Add an overlay option for overriding to FORCE_ANALOG_DOCK.

Change-Id: Ib7d70c242aa6f537ea5d65098ceb2c591662d8bb

Conflicts:
	core/res/res/values/config.xml
	media/java/android/media/AudioService.java
Add Facebook contact support (2/2)

Change-Id: If916092f2d3bc0a29cc2fc9aca41606d0d1f17fb
Merge branch 'jb4.2' of git://github.com/SlimRoms/frameworks_base into jb4.2
Merge branch 'jb4.2' of git://github.com/SlimRoms/frameworks_base into jb4.2
Merge branch 'jb4.2' of https://github.com/FauxAffliction/frameworks_base into jb4.2