Derp
Telephony: Add DCHSPAP to getTcpBufferSizesPropName

Change-Id: I868f0eae2db6032b43e9c1a1bd23860ab7bbebca
Pie: remove unused variable
Quick Settings: Revert swipe to switch feature.
Revert "Quick Settings: Revert swipe to switch feature."

This reverts commit b5cf02585a020685de250b9e58097b734f8f753b.
Revert "Derp"

This reverts commit 560762804a9498dd6ae32bc3e92c12d656d692af.
Revert "Quick Settings: Better handling for panels"

This reverts commit 148289208696ca028d230c4a3207e0367ca22f36.
Revert "Add a comment to avoid errors without Halo source."

This reverts commit 12962d8aac356fe1302998a01cd09da0b81582f2.
Revert "Quick Settings: Swipe to switch"

This reverts commit 49337dd4cff2c604b1d878b1590f38bb671f5ac0.
Merge branch 'jellybean' of github.com:ParanoidAndroid/android_frameworks_base into jellybean-legacy
Merge branch 'jellybean-legacy' of github.com:ParanoidAndroid/android_frameworks_base into jellybean-legacy