summaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorChristopher Tate <ctate@google.com>2010-08-24 18:27:01 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-08-24 18:27:01 -0700
commit176d0af368d163b8f2c36ea0474df734d3a105ce (patch)
tree55545cd7022059817dd14e78b029596a1ff5550b /packages
parent268957bcaffe8e5bf029e9f797bc21cd474fffed (diff)
parent384759b1c5e39d0f99fa551a369ae73197ab26c5 (diff)
downloadframeworks_base-176d0af368d163b8f2c36ea0474df734d3a105ce.zip
frameworks_base-176d0af368d163b8f2c36ea0474df734d3a105ce.tar.gz
frameworks_base-176d0af368d163b8f2c36ea0474df734d3a105ce.tar.bz2
am 384759b1: am 2b81d6dd: am 02e18d4d: Merge "Make the default backup configuration "disabled; local transport selected"" into froyo
Merge commit '384759b1c5e39d0f99fa551a369ae73197ab26c5' * commit '384759b1c5e39d0f99fa551a369ae73197ab26c5': Make the default backup configuration "disabled; local transport selected"
Diffstat (limited to 'packages')
-rw-r--r--packages/SettingsProvider/res/values/defaults.xml3
1 files changed, 2 insertions, 1 deletions
diff --git a/packages/SettingsProvider/res/values/defaults.xml b/packages/SettingsProvider/res/values/defaults.xml
index 185d72a..8349fe6 100644
--- a/packages/SettingsProvider/res/values/defaults.xml
+++ b/packages/SettingsProvider/res/values/defaults.xml
@@ -47,7 +47,8 @@
<bool name="def_networks_available_notification_on">true</bool>
<bool name="def_backup_enabled">false</bool>
- <string name="def_backup_transport" translatable="false"></string>
+ <string name="def_backup_transport" translatable="false">android/com.android.internal.backup.LocalTransport</string>
+
<!-- Default value for whether or not to pulse the notification LED when there is a
pending notification -->
<bool name="def_notification_pulse">true</bool>