Merge branch 'jb-mr1' of git://github.com/Root-Box/frameworks_base into RootBox
HALO: Add HDPI support - Icons: @kroz
Merge branch 'jb-mr1' of git://github.com/Root-Box/frameworks_base into RootBox