Fix NPE when cancelling the shortcut picker.

Change-Id: Id58410b5d5e99fe8361d21cec6ee3d15f382256c
Revert "Fix coding style."

This reverts commit 42b1727b5268363659ea1d8843452a33dc1f7c7b.

Change-Id: Ie8feb9dba61ce5cc263e4b09e063e0cd00ecdbe9
Revert "Bluetooth : Remove out of range devices after ScanComplete"

Reverting this change as it has some side effects and after
removing this gerrit the behavior is like commercial phone.

This reverts commit 2ba08f2d7efbfe7c0b0080f0e9a63e56d15695e7.

Change-Id: Ice89ccb6250f55f4e0235df27a3ecea64260b488
Halo MODs
Signed-off-by: scott <scott@ubuntu.com>

Change-Id: I91444b0e6b62228bdcf2b14864595fa01f91d447
Add wifi name to notification drawer
Signed-off-by: scott <scott@ubuntu.com>

Change-Id: I5255a316f55c349de8a8691eee3e97bd0060cfcd
HALO: Show summaries
Signed-off-by: scott <scott@ubuntu.com>

Change-Id: I7362cef59218ec3d6436dd23373089a3510df82d
fix up wifi and halo commits.  sloppiness.
Signed-off-by: scott <scott@ubuntu.com>

Change-Id: I9506c7cc94d13e1be5128888cecd06f2a26e6d5a
Revert "Add wifi name to notification drawer"

This reverts commit fe17f93646bc1cec47a1e356be23b27a31e1c2ea.
Merge branch 'jb43' of git://github.com/scotthartbti/android_packages_apps_Settings into beanstalk