Merge "Fix bluetooth device forgetting" into nyc-dev

am: b56d3a6

* commit 'b56d3a6c33f9d548247cbf8ed4894a3f4227b0e5':
  Fix bluetooth device forgetting

src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java

@@ -181,6 +181,7 @@ public abstract class DeviceListPreferenceFragment extends
 
         if (preference == null) {
             preference = new BluetoothDevicePreference(getPrefContext(), cachedDevice);
+            preference.setKey(key);
             mDeviceListGroup.addPreference(preference);
         } else {
             // Tell the preference it is being re-used in case there is new info in the