Track HALO
Merge branch 'jb2' of github.com:LiquidSmooth/android into jb2