Merge change 25354 into eclair

* changes:
  Fix string name for bluetooth pairing and fix NPE

AndroidManifest.xml

@@ -444,7 +444,7 @@
                   android:label="@string/bluetooth_connect_specific_profiles_title" />
 
         <activity android:name=".bluetooth.BluetoothPairingDialog"
-                  android:label="@string/bluetooth_pairing_dialog"
+                  android:label="@string/bluetooth_pairing_request"
                   android:excludeFromRecents="true"
                   android:theme="@*android:style/Theme.Dialog.Alert">
             <intent-filter>

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

@@ -256,7 +256,8 @@ public class LocalBluetoothManager {
         CachedBluetoothDevice cachedDevice = mCachedDeviceManager.findDevice(device);
         String name = null;
         if (cachedDevice == null) {
-            name = device.getName();
+            if (device != null) name = device.getName();
+
             if (name == null) {
                 name = mContext.getString(R.string.bluetooth_remote_device);
             }