Show dev-options also for non-eng builds
patch free-space dialog to work on the One X
volume rocker support
Add setting option to 'sounds' section
disable the 'simulate 2. display' option as people reported it to cause bootloops
Add config option for custom button longpress action
add config option for overflow button
add new profile for hwbuttons
Merge remote-tracking branch 'aosp/jb42' into jellybean