added contact lockscreen icon

Change-Id: I204e3a43d3e2beed391e605f3d3add55b24bb4b7
Duplicate Media cleanup

Clean duplicate notifications and ringtones.
JIRA : https://jira.cyanogenmod.org/browse/CYAN-292

Change-Id: Icab24ca455891c2347fd521e4d8c804cb024c51f
Option to use volume keys to control media volume anytime (2/2)

See Settings part for description

Change-Id: I78d26b0bd41f5b58514ae9c68208a8c950396823
Merge "Option to use volume keys to control media volume anytime (2/2)" into cm-10.1
FrameworkBase: Add missing AF translations

Change-Id: Ifb927bb38d46e450321f9014f65719c561eb8b43
Merge "added contact lockscreen icon" into cm-10.1
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
Quick app switch function for gesture navigation

Change-Id: I6ee19085aca039250de4fa4f133b24df9524a814
Merge remote-tracking branch 'cm/cm-10.1' into cm-10.1

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

Change-Id: Ib15dd8a45cefafa33e3f0cd1e8500fb240cb8726
Merge remote-tracking branch 'sgt7/cm-10.1' into cm-10.1-sgt7-linaro