Merge "Do not remove bonded devices from cached device list upon a device scan" into...

author Matthew Xie <mattx@google.com>

Wed, 10 Sep 2014 00:48:40 +0000 (00:48 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Wed, 10 Sep 2014 00:48:41 +0000 (00:48 +0000)
author Matthew Xie <mattx@google.com>
Wed, 10 Sep 2014 00:48:40 +0000 (00:48 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 10 Sep 2014 00:48:41 +0000 (00:48 +0000)
diff --cc src/com/android/settings/bluetooth/BluetoothSettings.java
Simple merge
author	Matthew Xie <mattx@google.com>
	Wed, 10 Sep 2014 00:48:40 +0000 (00:48 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 10 Sep 2014 00:48:41 +0000 (00:48 +0000)