diff options
| author | Jaikumar Ganesh <jaikumar@google.com> | 2009-09-17 08:41:11 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-09-17 08:41:11 -0700 |
| commit | e60a8ebd0e2a1911c0c5ac5f5b1d3e8f1c212cb1 (patch) | |
| tree | 356b8de49e56ad91f5204a780037a51d6071b05e /AndroidManifest.xml | |
| parent | 5bfc786ebe258a349aba57aedbb38717ae696c13 (diff) | |
| parent | bb3343923c640461eecc4fac25f911224a16d056 (diff) | |
| download | packages_apps_settings-e60a8ebd0e2a1911c0c5ac5f5b1d3e8f1c212cb1.zip packages_apps_settings-e60a8ebd0e2a1911c0c5ac5f5b1d3e8f1c212cb1.tar.gz packages_apps_settings-e60a8ebd0e2a1911c0c5ac5f5b1d3e8f1c212cb1.tar.bz2 | |
am bb334392: Merge change 25354 into eclair
Merge commit 'bb3343923c640461eecc4fac25f911224a16d056' into eclair-plus-aosp
* commit 'bb3343923c640461eecc4fac25f911224a16d056':
Fix string name for bluetooth pairing and fix NPE
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 550e4be..a6ffb58 100644 --- a/AndroidManifest.xml +++ b/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> |