diff options
| author | Jaikumar Ganesh <jaikumar@google.com> | 2009-09-13 23:07:55 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-09-13 23:07:55 -0700 |
| commit | 1b7ffcf4957191cbd805a4863ece75cd549575e9 (patch) | |
| tree | 7193b7af8b38ca5cc6050925cf68612af6959733 /AndroidManifest.xml | |
| parent | f9dce06d5ee028335ff445335303464ebb403901 (diff) | |
| parent | 5f23cb39a1bd9c319383108c209fca7f0256894b (diff) | |
| download | packages_apps_settings-1b7ffcf4957191cbd805a4863ece75cd549575e9.zip packages_apps_settings-1b7ffcf4957191cbd805a4863ece75cd549575e9.tar.gz packages_apps_settings-1b7ffcf4957191cbd805a4863ece75cd549575e9.tar.bz2 | |
am 5f23cb39: Modify settings for 2.1
Merge commit '5f23cb39a1bd9c319383108c209fca7f0256894b' into eclair-plus-aosp
* commit '5f23cb39a1bd9c319383108c209fca7f0256894b':
Modify settings for 2.1
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 4a5b258..2512241 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_pin_entry" + android:label="@string/bluetooth_pairing_dialog" android:excludeFromRecents="true" android:theme="@*android:style/Theme.Dialog.Alert"> <intent-filter> |