HALO:  Fix crash: missing hdpi icon
Signed-off-by: Paul Beeler <sparksco@gmail.com>
Use Tablet/Phone/Device instead of Nexus
Signed-off-by: Paul Beeler <sparksco@gmail.com>
Merge remote-tracking branch 'sm/sm-jb-mr1' into sm-jb-mr1