Hybrid Settings (BeerGang)
2.4 beta with hybrid
Fix Android System spacing on 320
Merge branch 'jellybean' into jellybean-hybrid