Enable custom actions for double tap home (2/2)

Change-Id: Iaa837b52b993f168d0eb3b8ba806304c7f3fe588
Merge "Enable custom actions for double tap home (2/2)" into cm-10.2
Merge branch 'cm-10.2' of git://github.com/CyanogenMod/android_packages_apps_Settings into cm-10.2

Conflicts:
	src/com/android/settings/cyanogenmod/ButtonSettings.java