am 1337d0f7: Implement issue #3094621 and #3094609 - wipe sd card

Merge commit '1337d0f70b18dd732c6a617be83e5be0bb8f2f87' into gingerbread-plus-aosp

* commit '1337d0f70b18dd732c6a617be83e5be0bb8f2f87':
  Implement issue #3094621 and #3094609 - wipe sd card
This commit is contained in:
Dianne Hackborn
2010-10-16 16:55:30 -07:00
committed by Android Git Automerger
13 changed files with 695 additions and 204 deletions

View File

@@ -16,7 +16,8 @@
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<PreferenceCategory android:title="@string/sd_memory">
<PreferenceCategory android:key="memory_sd"
android:title="@string/sd_memory">
<Preference android:key="memory_sd_size"
style="?android:attr/preferenceInformationStyle"
android:title="@string/memory_size"