Merge "Cancel bonding upon back gesture." into tm-dev

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

@@ -82,6 +82,12 @@ public class BluetoothPairingDialogFragment extends InstrumentedDialogFragment i
         return mDialog;
     }
 
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        mPairingController.onCancel();
+    }
+
     @Override
     public void beforeTextChanged(CharSequence s, int start, int count, int after) {
     }