Fix build
Merge branch 'jb3' of https://github.com/CarbonDev/android_packages_apps_Settings into jb3
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
Merge commit '3d78f56035ad0a5305dfa3a0e7a1a75955997e95' into jb3
Fix duplicated variable
Merge remote-tracking branch 'upstream/jb3' into jb3