diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index f3dc3d6..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-# We need a way to prevent the stuff Google Apps replaces from being included in the build.
-# This is a hacky way to do that.
-ifdef CYANOGEN_WITH_GOOGLE
-    PACKAGES.Email.OVERRIDES := Provision QuickSearchBox
-endif
diff --git a/CHANGELOG b/CHANGELOG
deleted file mode 100644
index 70508b9..0000000
--- a/CHANGELOG
+++ /dev/null
@@ -1 +0,0 @@
-Moved to http://github.com/CyanogenMod/android_vendor_cyanogen/blob/froyo/CHANGELOG.mkdn
diff --git a/config/common.mk b/config/common.mk
new file mode 100644
index 0000000..9649c62
--- /dev/null
+++ b/config/common.mk
@@ -0,0 +1,52 @@
+ifdef CM_NIGHTLY
+PRODUCT_PROPERTY_OVERRIDES += \
+    ro.rommanager.developerid=cyanogenmodnightly
+else
+PRODUCT_PROPERTY_OVERRIDES += \
+    ro.rommanager.developerid=cyanogenmod
+endif
+
+PRODUCT_BUILD_PROP_OVERRIDES += BUILD_UTC_DATE=0
+
+PRODUCT_PROPERTY_OVERRIDES += \
+    keyguard.no_require_sim=true \
+    ro.url.legal=http://www.google.com/intl/%s/mobile/android/basic/phone-legal.html \
+    ro.url.legal.android_privacy=http://www.google.com/intl/%s/mobile/android/basic/privacy.html \
+    ro.com.google.clientidbase=android-google \
+    ro.com.android.wifi-watchlist=GoogleGuest \
+    ro.setupwizard.enterprise_mode=1 \
+    ro.com.android.dateformat=MM-dd-yyyy \
+    ro.com.android.dataroaming=false
+
+# Copy over the changelog to the device
+PRODUCT_COPY_FILES += \
+    vendor/cm/CHANGELOG.mkdn:system/etc/CHANGELOG-CM.txt
+
+PRODUCT_COPY_FILES += \
+    vendor/cm/prebuilt/common/bin/backuptool.sh:system/bin/backuptool.sh
+
+PRODUCT_COPY_FILES +=  \
+    vendor/cm/proprietary/RomManager.apk:system/app/RomManager.apk \
+    vendor/cm/prebuilt/common/bootanimation.zip:system/media/bootanimation.zip
+  	
+
+# Enable SIP+VoIP on all targets
+PRODUCT_COPY_FILES += \
+    frameworks/base/data/etc/android.software.sip.voip.xml:system/etc/permissions/android.software.sip.voip.xml
+
+# Required CM packages
+PRODUCT_PACKAGES += \
+    LatinIME \
+    Superuser.apk \
+    su
+
+# Optional CM packages
+PRODUCT_PACKAGES += \
+    Basic \
+    HoloSpiral \
+    MagicSmoke \
+    NoiseField \
+    Galaxy4 \
+    LiveWallpapersPicker \
+    MusicVisualization \
+    PhaseBeam
diff --git a/config/common_full_phone.mk b/config/common_full_phone.mk
new file mode 100644
index 0000000..a7f758d
--- /dev/null
+++ b/config/common_full_phone.mk
@@ -0,0 +1,14 @@
+# Inherit common CM stuff
+$(call inherit-product, vendor/cm/config/common.mk)
+
+# Bring in all audio files
+include frameworks/base/data/sounds/AllAudio.mk
+
+# Default ringtone
+PRODUCT_PROPERTY_OVERRIDES += \
+    ro.config.ringtone=Playa.ogg \
+    ro.config.notification_sound=regulus.ogg \
+    ro.config.alarm_alert=Alarm_Beep_03.ogg
+
+PRODUCT_PACKAGES += \
+  Mms
diff --git a/config/common_versions.mk b/config/common_versions.mk
new file mode 100644
index 0000000..24f360d
--- /dev/null
+++ b/config/common_versions.mk
@@ -0,0 +1,21 @@
+PRODUCT_BRAND := cm
+
+PRODUCT_VERSION_MAJOR = 9
+PRODUCT_VERSION_MINOR = 0
+PRODUCT_VERSION_MAINTENANCE = 0-RC0
+
+PRODUCT_BUILD_PROP_OVERRIDES += BUILD_DISPLAY_ID=ITL41D
+
+ifdef CM_NIGHTLY
+    PRODUCT_PROPERTY_OVERRIDES += \
+        ro.modversion=CyanogenMod-$(PRODUCT_VERSION_MAJOR)-$(shell date +%m%d%Y)-NIGHTLY-$(PRODUCT_RELEASE_NAME)
+else
+    ifdef CM_RELEASE
+        PRODUCT_PROPERTY_OVERRIDES += \
+            ro.modversion=CyanogenMod-$(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)$(PRODUCT_VERSION_DEVICE_SPECIFIC)-$(PRODUCT_RELEASE_NAME)
+    else
+        PRODUCT_PROPERTY_OVERRIDES += \
+            ro.modversion=CyanogenMod-$(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)$(PRODUCT_VERSION_DEVICE_SPECIFIC)-$(PRODUCT_RELEASE_NAME)-KANG
+    endif
+endif
+
diff --git a/config/gsm.mk b/config/gsm.mk
new file mode 100644
index 0000000..58a8af5
--- /dev/null
+++ b/config/gsm.mk
@@ -0,0 +1,12 @@
+# GSM APN list
+PRODUCT_COPY_FILES += \
+    vendor/cm/prebuilt/common/etc/apns-conf.xml:system/etc/apns-conf.xml
+
+# GSM SPN overrides list
+PRODUCT_COPY_FILES += \
+    vendor/cm/prebuilt/common/etc/spn-conf.xml:system/etc/spn-conf.xml
+
+# SIM Toolkit
+PRODUCT_PACKAGES += \
+    Stk
+
diff --git a/extract-gapps-files b/extract-gapps-files
deleted file mode 100755
index ef99e52..0000000
--- a/extract-gapps-files
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash
-#
-# Extract gapps files from downloaded zip file.
-#
-# Just a replacement for get-google-files script.
-#
-
-usage() {
-    cat << EOF
-Usage: $0 <path-to-gapp-zip-file>
-EOF
-}
-
-if [ $# -lt 1 ]; then
-    usage
-    exit 1
-fi
-
-GAPPS="$1"
-
-cd `dirname $0`
-
-mkdir -p proprietary
-mkdir tmp
-
-unzip -q -o -d tmp $GAPPS
-
-find tmp/system -type f -exec mv -v -f {} proprietary/ \;
-
-rm -rf tmp
diff --git a/extract-google-files b/extract-google-files
deleted file mode 100755
index 27de164..0000000
--- a/extract-google-files
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/bash
-
-cd `dirname $0`
-mkdir -p proprietary
-
-adb pull /system/app/CarHomeGoogle.apk proprietary
-adb pull /system/app/CarHomeLauncher.apk proprietary
-adb pull /system/app/Facebook.apk proprietary
-adb pull /system/app/GenieWidget.apk proprietary
-adb pull /system/app/Gmail.apk proprietary
-adb pull /system/app/GoogleBackupTransport.apk proprietary
-adb pull /system/app/GoogleCalendarSyncAdapter.apk proprietary
-adb pull /system/app/GoogleContactsSyncAdapter.apk proprietary
-adb pull /system/app/GoogleFeedback.apk proprietary
-adb pull /system/app/GooglePartnerSetup.apk proprietary
-adb pull /system/app/GoogleQuickSearchBox.apk proprietary
-adb pull /system/app/GoogleServicesFramework.apk proprietary
-adb pull /system/app/HtcCopyright.apk proprietary
-adb pull /system/app/HtcEmailPolicy.apk proprietary
-adb pull /system/app/HtcSettings.apk proprietary
-adb pull /system/app/LatinImeGoogle.apk proprietary
-adb pull /system/app/LatinImeTutorial.apk proprietary
-adb pull /system/app/Maps.apk proprietary
-adb pull /system/app/MarketUpdater.apk proprietary
-adb pull /system/app/MediaUploader.apk proprietary
-adb pull /system/app/NetworkLocation.apk proprietary
-adb pull /system/app/OneTimeInitializer.apk proprietary
-adb pull /system/app/PassionQuickOffice.apk proprietary
-adb pull /system/app/SetupWizard.apk proprietary
-adb pull /system/app/Street.apk proprietary
-adb pull /system/app/Talk.apk proprietary
-adb pull /system/app/Twitter.apk proprietary
-adb pull /system/app/Vending.apk proprietary
-adb pull /system/app/VoiceSearch.apk proprietary
-adb pull /system/app/YouTube.apk proprietary
-adb pull /system/app/googlevoice.apk proprietary
-adb pull /system/app/kickback.apk proprietary
-adb pull /system/app/soundback.apk proprietary
-adb pull /system/app/talkback.apk proprietary
-adb pull /system/etc/permissions/com.google.android.maps.xml proprietary
-adb pull /system/etc/permissions/features.xml proprietary
-adb pull /system/framework/com.google.android.maps.jar proprietary
-adb pull /system/lib/libspeech.so proprietary
-
diff --git a/overlay/ace/frameworks/base/core/res/res/values/config.xml b/overlay/ace/frameworks/base/core/res/res/values/config.xml
deleted file mode 100644
index 960a389..0000000
--- a/overlay/ace/frameworks/base/core/res/res/values/config.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2011, The CyanogenMod Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<resources>
-
-    <!-- Component name of the default wallpaper. This will be ImageWallpaper if not
-         specified -->
-    <string name="default_wallpaper_component">com.android.wallpaper/.nexus.NexusWallpaper</string>
-
-</resources>
diff --git a/overlay/ace/packages/apps/CMParts/res/values/config.xml b/overlay/ace/packages/apps/CMParts/res/values/config.xml
deleted file mode 100644
index 1f71848..0000000
--- a/overlay/ace/packages/apps/CMParts/res/values/config.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- Whether or not to display the trackball settings -->
-    <bool name="has_trackball">false</bool>
-    <bool name="has_rgb_notification_led">false</bool>
-
-    <bool name="has_led_flash">true</bool>
-</resources>
diff --git a/overlay/bcm_fm_radio/packages/apps/FM/res/values/config.xml b/overlay/bcm_fm_radio/packages/apps/FM/res/values/config.xml
deleted file mode 100644
index bbb78f7..0000000
--- a/overlay/bcm_fm_radio/packages/apps/FM/res/values/config.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- Whether or not seek is supported -->
-    <bool name="seek_supported">true</bool>
-</resources>
diff --git a/overlay/bravo/frameworks/base/core/res/res/values/config.xml b/overlay/bravo/frameworks/base/core/res/res/values/config.xml
deleted file mode 100644
index 960a389..0000000
--- a/overlay/bravo/frameworks/base/core/res/res/values/config.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2011, The CyanogenMod Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<resources>
-
-    <!-- Component name of the default wallpaper. This will be ImageWallpaper if not
-         specified -->
-    <string name="default_wallpaper_component">com.android.wallpaper/.nexus.NexusWallpaper</string>
-
-</resources>
diff --git a/overlay/bravo/packages/apps/CMParts/res/values/config.xml b/overlay/bravo/packages/apps/CMParts/res/values/config.xml
deleted file mode 100644
index e4b04b6..0000000
--- a/overlay/bravo/packages/apps/CMParts/res/values/config.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- Whether or not to display the trackball settings -->
-    <bool name="has_trackball">true</bool>
-    <bool name="has_rgb_notification_led">false</bool>
-
-    <bool name="has_led_flash">true</bool>
-</resources>
diff --git a/overlay/captivatemtd/frameworks/base/core/res/res/values/config.xml b/overlay/captivatemtd/frameworks/base/core/res/res/values/config.xml
deleted file mode 100644
index 8b667e7..0000000
--- a/overlay/captivatemtd/frameworks/base/core/res/res/values/config.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2009, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-<resources>
-
-    <!-- Component name of the default wallpaper. This will be ImageWallpaper if not 
-         specified -->
-    <string name="default_wallpaper_component">com.android.wallpaper/.nexus.NexusWallpaper</string>
-
-</resources>
diff --git a/overlay/captivatemtd/packages/apps/CMParts/res/values/config.xml b/overlay/captivatemtd/packages/apps/CMParts/res/values/config.xml
deleted file mode 100644
index 443462f..0000000
--- a/overlay/captivatemtd/packages/apps/CMParts/res/values/config.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- Whether or not to display the trackball settings -->
-    <bool name="has_trackball">false</bool>
-    <bool name="has_rgb_notification_led">false</bool>
-    <bool name="has_camera_button">false</bool>
-    <bool name="has_led_flash">false</bool>
-</resources>
diff --git a/overlay/common/frameworks/base/core/res/assets/images/android-logo-mask.png b/overlay/common/frameworks/base/core/res/assets/images/android-logo-mask.png
deleted file mode 100644
index 517761e..0000000
--- a/overlay/common/frameworks/base/core/res/assets/images/android-logo-mask.png
+++ /dev/null
Binary files differ
diff --git a/overlay/common/frameworks/base/core/res/assets/images/android-logo-shine.png b/overlay/common/frameworks/base/core/res/assets/images/android-logo-shine.png
deleted file mode 100644
index 80dba97..0000000
--- a/overlay/common/frameworks/base/core/res/assets/images/android-logo-shine.png
+++ /dev/null
Binary files differ
diff --git a/overlay/common/frameworks/base/core/res/res/drawable-hdpi/status_bar_background.png b/overlay/common/frameworks/base/core/res/res/drawable-hdpi/status_bar_background.png
deleted file mode 100644
index 55ccac7..0000000
--- a/overlay/common/frameworks/base/core/res/res/drawable-hdpi/status_bar_background.png
+++ /dev/null
Binary files differ
diff --git a/overlay/common/frameworks/base/core/res/res/drawable-hdpi/status_bar_background_cust.png b/overlay/common/frameworks/base/core/res/res/drawable-hdpi/status_bar_background_cust.png
deleted file mode 100644
index 9320333..0000000
--- a/overlay/common/frameworks/base/core/res/res/drawable-hdpi/status_bar_background_cust.png
+++ /dev/null
Binary files differ
diff --git a/overlay/common/frameworks/base/core/res/res/drawable-hdpi/status_bar_close_on_cust.9.png b/overlay/common/frameworks/base/core/res/res/drawable-hdpi/status_bar_close_on_cust.9.png
deleted file mode 100644
index 2602245..0000000
--- a/overlay/common/frameworks/base/core/res/res/drawable-hdpi/status_bar_close_on_cust.9.png
+++ /dev/null
Binary files differ
diff --git a/overlay/common/frameworks/base/core/res/res/drawable-hdpi/status_bar_header_background_cust.9.png b/overlay/common/frameworks/base/core/res/res/drawable-hdpi/status_bar_header_background_cust.9.png
deleted file mode 100644
index 310ecb9..0000000
--- a/overlay/common/frameworks/base/core/res/res/drawable-hdpi/status_bar_header_background_cust.9.png
+++ /dev/null
Binary files differ
diff --git a/overlay/common/frameworks/base/core/res/res/drawable-hdpi/status_bar_item_background_focus_cust.9.png b/overlay/common/frameworks/base/core/res/res/drawable-hdpi/status_bar_item_background_focus_cust.9.png
deleted file mode 100644
index f0f7d68..0000000
--- a/overlay/common/frameworks/base/core/res/res/drawable-hdpi/status_bar_item_background_focus_cust.9.png
+++ /dev/null
Binary files differ
diff --git a/overlay/common/frameworks/base/core/res/res/drawable-hdpi/status_bar_item_background_normal_cust.9.png b/overlay/common/frameworks/base/core/res/res/drawable-hdpi/status_bar_item_background_normal_cust.9.png
deleted file mode 100644
index 39a4c88..0000000
--- a/overlay/common/frameworks/base/core/res/res/drawable-hdpi/status_bar_item_background_normal_cust.9.png
+++ /dev/null
Binary files differ
diff --git a/overlay/common/frameworks/base/core/res/res/drawable-hdpi/status_bar_item_background_pressed_cust.9.png b/overlay/common/frameworks/base/core/res/res/drawable-hdpi/status_bar_item_background_pressed_cust.9.png
deleted file mode 100644
index 42c7a0a..0000000
--- a/overlay/common/frameworks/base/core/res/res/drawable-hdpi/status_bar_item_background_pressed_cust.9.png
+++ /dev/null
Binary files differ
diff --git a/overlay/common/frameworks/base/core/res/res/drawable-hdpi/statusbar_background.9.png b/overlay/common/frameworks/base/core/res/res/drawable-hdpi/statusbar_background.9.png
deleted file mode 100644
index 9c88ed7..0000000
--- a/overlay/common/frameworks/base/core/res/res/drawable-hdpi/statusbar_background.9.png
+++ /dev/null
Binary files differ
diff --git a/overlay/common/frameworks/base/core/res/res/drawable-hdpi/statusbar_background_sq.9.png b/overlay/common/frameworks/base/core/res/res/drawable-hdpi/statusbar_background_sq.9.png
deleted file mode 100644
index c8a6073..0000000
--- a/overlay/common/frameworks/base/core/res/res/drawable-hdpi/statusbar_background_sq.9.png
+++ /dev/null
Binary files differ
diff --git a/overlay/common/frameworks/base/core/res/res/drawable-hdpi/title_bar_portrait_cust.9.png b/overlay/common/frameworks/base/core/res/res/drawable-hdpi/title_bar_portrait_cust.9.png
deleted file mode 100644
index 9220b4f..0000000
--- a/overlay/common/frameworks/base/core/res/res/drawable-hdpi/title_bar_portrait_cust.9.png
+++ /dev/null
Binary files differ
diff --git a/overlay/common/frameworks/base/core/res/res/drawable-mdpi/status_bar_background.png b/overlay/common/frameworks/base/core/res/res/drawable-mdpi/status_bar_background.png
deleted file mode 100644
index ca5e7b8..0000000
--- a/overlay/common/frameworks/base/core/res/res/drawable-mdpi/status_bar_background.png
+++ /dev/null
Binary files differ
diff --git a/overlay/common/frameworks/base/core/res/res/drawable-mdpi/status_bar_background_cust.png b/overlay/common/frameworks/base/core/res/res/drawable-mdpi/status_bar_background_cust.png
deleted file mode 100644
index 71a5cf0..0000000
--- a/overlay/common/frameworks/base/core/res/res/drawable-mdpi/status_bar_background_cust.png
+++ /dev/null
Binary files differ
diff --git a/overlay/common/frameworks/base/core/res/res/drawable-mdpi/status_bar_close_on_cust.9.png b/overlay/common/frameworks/base/core/res/res/drawable-mdpi/status_bar_close_on_cust.9.png
deleted file mode 100644
index c5f1d41..0000000
--- a/overlay/common/frameworks/base/core/res/res/drawable-mdpi/status_bar_close_on_cust.9.png
+++ /dev/null
Binary files differ
diff --git a/overlay/common/frameworks/base/core/res/res/drawable-mdpi/status_bar_header_background_cust.9.png b/overlay/common/frameworks/base/core/res/res/drawable-mdpi/status_bar_header_background_cust.9.png
deleted file mode 100644
index 935b9de..0000000
--- a/overlay/common/frameworks/base/core/res/res/drawable-mdpi/status_bar_header_background_cust.9.png
+++ /dev/null
Binary files differ
diff --git a/overlay/common/frameworks/base/core/res/res/drawable-mdpi/status_bar_item_background_focus_cust.9.png b/overlay/common/frameworks/base/core/res/res/drawable-mdpi/status_bar_item_background_focus_cust.9.png
deleted file mode 100644
index 7b7e8a9..0000000
--- a/overlay/common/frameworks/base/core/res/res/drawable-mdpi/status_bar_item_background_focus_cust.9.png
+++ /dev/null
Binary files differ
diff --git a/overlay/common/frameworks/base/core/res/res/drawable-mdpi/status_bar_item_background_normal_cust.9.png b/overlay/common/frameworks/base/core/res/res/drawable-mdpi/status_bar_item_background_normal_cust.9.png
deleted file mode 100644
index be8c33c..0000000
--- a/overlay/common/frameworks/base/core/res/res/drawable-mdpi/status_bar_item_background_normal_cust.9.png
+++ /dev/null
Binary files differ
diff --git a/overlay/common/frameworks/base/core/res/res/drawable-mdpi/status_bar_item_background_pressed_cust.9.png b/overlay/common/frameworks/base/core/res/res/drawable-mdpi/status_bar_item_background_pressed_cust.9.png
deleted file mode 100644
index f678498..0000000
--- a/overlay/common/frameworks/base/core/res/res/drawable-mdpi/status_bar_item_background_pressed_cust.9.png
+++ /dev/null
Binary files differ
diff --git a/overlay/common/frameworks/base/core/res/res/drawable-mdpi/statusbar_background.9.png b/overlay/common/frameworks/base/core/res/res/drawable-mdpi/statusbar_background.9.png
deleted file mode 100644
index e2b6f58..0000000
--- a/overlay/common/frameworks/base/core/res/res/drawable-mdpi/statusbar_background.9.png
+++ /dev/null
Binary files differ
diff --git a/overlay/common/frameworks/base/core/res/res/drawable-mdpi/statusbar_background_sq.9.png b/overlay/common/frameworks/base/core/res/res/drawable-mdpi/statusbar_background_sq.9.png
deleted file mode 100644
index bcaf196..0000000
--- a/overlay/common/frameworks/base/core/res/res/drawable-mdpi/statusbar_background_sq.9.png
+++ /dev/null
Binary files differ
diff --git a/overlay/common/frameworks/base/core/res/res/drawable-mdpi/title_bar_portrait_cust.9.png b/overlay/common/frameworks/base/core/res/res/drawable-mdpi/title_bar_portrait_cust.9.png
deleted file mode 100644
index c4d4827..0000000
--- a/overlay/common/frameworks/base/core/res/res/drawable-mdpi/title_bar_portrait_cust.9.png
+++ /dev/null
Binary files differ
diff --git a/overlay/common/frameworks/base/core/res/res/drawable/default_wallpaper.jpg b/overlay/common/frameworks/base/core/res/res/drawable/default_wallpaper.jpg
deleted file mode 100644
index 0c29d88..0000000
--- a/overlay/common/frameworks/base/core/res/res/drawable/default_wallpaper.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/common/frameworks/base/core/res/res/values/config.xml b/overlay/common/frameworks/base/core/res/res/values/config.xml
deleted file mode 100644
index 2a3ecb2..0000000
--- a/overlay/common/frameworks/base/core/res/res/values/config.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2011, The CyanogenMod Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<resources>
-    <!-- Enables SIP on WIFI only -->
-    <bool name="config_sip_wifi_only">false</bool>
-</resources>
-
diff --git a/overlay/common/frameworks/base/packages/SettingsProvider/res/values/defaults.xml b/overlay/common/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
deleted file mode 100644
index c652ac9..0000000
--- a/overlay/common/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/**
- * Copyright (c) 2009, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
-<resources>
-    <string name="def_backup_transport">com.google.android.backup/.BackupTransportService</string>
-</resources>
diff --git a/overlay/common/frameworks/base/packages/SystemUI/res/values/config.xml b/overlay/common/frameworks/base/packages/SystemUI/res/values/config.xml
deleted file mode 100644
index 88851f7..0000000
--- a/overlay/common/frameworks/base/packages/SystemUI/res/values/config.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2011, The CyanogenMod Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- These resources are around just to allow their values to be customized
-     for different hardware and product builds. -->
-<resources>
-    <!-- Control whether status bar should distinguish HSPA data icon form UMTS data icon on devices -->
-    <bool name="config_hspa_data_distinguishable">true</bool>
-</resources>
-
diff --git a/overlay/common/packages/apps/ADWLauncher/res/values/config.xml b/overlay/common/packages/apps/ADWLauncher/res/values/config.xml
deleted file mode 100644
index 6ffd687..0000000
--- a/overlay/common/packages/apps/ADWLauncher/res/values/config.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The CyanogenMod Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <bool name="config_fadeDrawerLabels">true</bool>
-    <bool name="config_nagScreen">false</bool>
-    <bool name="config_new_selectors">true</bool>
-    <integer name="config_desktopBounce">30</integer>
-    <integer name="config_desktopSpeed">600</integer>
-    <integer name="config_drawer_color">0x80000000</integer>
-    <integer name="config_drawerColumnsPortrait">4</integer>
-    <integer name="config_drawerColumnsLandscape">5</integer>
-    <integer name="config_zoomSpeed">200</integer>
-    <string name="config_swipedown_actions">0</string>
-    <string name="config_swipeup_actions">0</string>
-    <string name="config_homeBinding">1</string>
-    <string name="config_drawer_style">0</string>
-    <integer name="config_highlights_color">0xa0000000</integer>
-    <integer name="config_highlights_color_focus">0xa0000000</integer>
-</resources>
-
diff --git a/overlay/common/packages/apps/ADWLauncher/res/xml/default_workspace.xml b/overlay/common/packages/apps/ADWLauncher/res/xml/default_workspace.xml
deleted file mode 100644
index d60d25f..0000000
--- a/overlay/common/packages/apps/ADWLauncher/res/xml/default_workspace.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The CyanogenMod Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<favorites xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher">
-<!--  ALL APPS -->
-    <shortcut
-        launcher:uri="#Intent;action=com.android.launcher.action.launcheraction;component=com.android.launcher/.CustomShirtcutActivity;i.DefaultLauncherAction.EXTRA_BINDINGVALUE=4;end"
-        launcher:icon="@drawable/all_apps_button"
-        launcher:title="@string/launcher_actions"
-        launcher:screen="-1"
-        launcher:x="-1"
-        launcher:y="-1"
-        launcher:container="-700" />
-    <!-- LAB -->
-    <favorite
-        launcher:packageName="com.android.contacts"
-        launcher:className="com.android.contacts.DialtactsActivity"
-        launcher:screen="-1"
-        launcher:x="-1"
-        launcher:y="-1"
-        launcher:container="-300" />
-
-    <!-- RAB -->
-    <favorite
-        launcher:packageName="com.android.browser"
-        launcher:className="com.android.browser.BrowserActivity"
-        launcher:screen="-1"
-        launcher:x="-1"
-        launcher:y="-1"
-        launcher:container="-400" />
-
-    <!--  Left screen [1] -->
-    <favorite
-        launcher:packageName="com.android.camera"
-        launcher:className="com.android.camera.Camera"
-        launcher:screen="1"
-        launcher:x="1"
-        launcher:y="3" />
-
-     <favorite
-        launcher:packageName="com.cooliris.media"
-        launcher:className="com.cooliris.media.Gallery"
-        launcher:screen="1"
-        launcher:x="2"
-        launcher:y="3" />
-
-    <!--  Middle screen [2] -->
-    <search
-        launcher:screen="2"
-        launcher:x="0"
-        launcher:y="0" />
-
-    <appwidget
-        launcher:packageName="com.android.protips"
-        launcher:className="com.android.protips.ProtipWidget"
-        launcher:screen="2"
-        launcher:x="0"
-        launcher:y="1"
-        launcher:spanX="4"
-        launcher:spanY="1" />
-
-    <favorite
-        launcher:packageName="com.android.mms"
-        launcher:className="com.android.mms.ui.ConversationList"
-        launcher:screen="2"
-        launcher:x="0"
-        launcher:y="3" />
-
-    <favorite
-        launcher:packageName="com.android.contacts"
-        launcher:className="com.android.contacts.DialtactsContactsEntryActivity"
-        launcher:screen="2"
-        launcher:x="1"
-        launcher:y="3" />
-
-    <favorite
-        launcher:packageName="com.android.vending"
-        launcher:className="com.android.vending.AssetBrowserActivity"
-        launcher:screen="2"
-        launcher:x="2"
-        launcher:y="3" />
-
-    <favorite
-        launcher:packageName="com.android.deskclock"
-        launcher:className="com.android.deskclock.DeskClock"
-        launcher:screen="2"
-        launcher:x="3"
-        launcher:y="3" />
-
-    <!--  Right screen [3] -->
-    <appwidget
-        launcher:packageName="com.android.music"
-        launcher:className="com.android.music.MediaAppWidgetProvider4x2"
-        launcher:screen="3"
-        launcher:x="0"
-        launcher:y="0"
-        launcher:spanX="4"
-        launcher:spanY="2" />
-
-    <favorite
-        launcher:packageName="com.android.email"
-        launcher:className="com.android.email.activity.Welcome"
-        launcher:screen="3"
-        launcher:x="1"
-        launcher:y="3" />
-
-    <favorite
-        launcher:packageName="com.google.android.talk"
-        launcher:className="com.google.android.talk.SigningInActivity"
-        launcher:screen="3"
-        launcher:x="2"
-        launcher:y="3" />
-</favorites>
diff --git a/overlay/common/packages/apps/Music3/res/values/config.xml b/overlay/common/packages/apps/Music3/res/values/config.xml
deleted file mode 100644
index c152a14..0000000
--- a/overlay/common/packages/apps/Music3/res/values/config.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-        <bool name="config_isMarketVersion">false</bool>
-        <bool name="config_enableLockScreen">false</bool>
-        <bool name="config_controlsOnBottom">true</bool>
-        <integer name="config_defaultRenderer">1</integer>
-</resources>
-
diff --git a/overlay/common/packages/inputmethods/LatinIME/java/res/raw-de/main.dict b/overlay/common/packages/inputmethods/LatinIME/java/res/raw-de/main.dict
deleted file mode 100644
index 865c5f1..0000000
--- a/overlay/common/packages/inputmethods/LatinIME/java/res/raw-de/main.dict
+++ /dev/null
Binary files differ
diff --git a/overlay/common/packages/inputmethods/LatinIME/java/res/raw-en/main.dict b/overlay/common/packages/inputmethods/LatinIME/java/res/raw-en/main.dict
deleted file mode 100644
index 472c23a..0000000
--- a/overlay/common/packages/inputmethods/LatinIME/java/res/raw-en/main.dict
+++ /dev/null
Binary files differ
diff --git a/overlay/common/packages/inputmethods/LatinIME/java/res/raw-es/main.dict b/overlay/common/packages/inputmethods/LatinIME/java/res/raw-es/main.dict
deleted file mode 100644
index cadb38c..0000000
--- a/overlay/common/packages/inputmethods/LatinIME/java/res/raw-es/main.dict
+++ /dev/null
Binary files differ
diff --git a/overlay/common/packages/inputmethods/LatinIME/java/res/raw-fr/main.dict b/overlay/common/packages/inputmethods/LatinIME/java/res/raw-fr/main.dict
deleted file mode 100644
index 289539a..0000000
--- a/overlay/common/packages/inputmethods/LatinIME/java/res/raw-fr/main.dict
+++ /dev/null
Binary files differ
diff --git a/overlay/common/packages/inputmethods/LatinIME/java/res/raw-it/main.dict b/overlay/common/packages/inputmethods/LatinIME/java/res/raw-it/main.dict
deleted file mode 100644
index 563c00a..0000000
--- a/overlay/common/packages/inputmethods/LatinIME/java/res/raw-it/main.dict
+++ /dev/null
Binary files differ
diff --git a/overlay/common/packages/inputmethods/OpenWnn/res/values-ja-rCN/bools.xml b/overlay/common/packages/inputmethods/OpenWnn/res/values-ja-rCN/bools.xml
deleted file mode 100644
index c3291be..0000000
--- a/overlay/common/packages/inputmethods/OpenWnn/res/values-ja-rCN/bools.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<resources>
-  <bool name="im_is_default">true</bool>
-</resources>
diff --git a/overlay/common/packages/inputmethods/OpenWnn/res/values-ja/bools.xml b/overlay/common/packages/inputmethods/OpenWnn/res/values-ja/bools.xml
deleted file mode 100644
index c3291be..0000000
--- a/overlay/common/packages/inputmethods/OpenWnn/res/values-ja/bools.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<resources>
-  <bool name="im_is_default">true</bool>
-</resources>
diff --git a/overlay/common/packages/inputmethods/OpenWnn/res/values/bools.xml b/overlay/common/packages/inputmethods/OpenWnn/res/values/bools.xml
deleted file mode 100644
index d2e0981..0000000
--- a/overlay/common/packages/inputmethods/OpenWnn/res/values/bools.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<resources>
-    <add-resource type="bool" name="im_is_default">false</add-resource>
-</resources>
diff --git a/overlay/common/packages/inputmethods/OpenWnn/res/xml/method_ja.xml b/overlay/common/packages/inputmethods/OpenWnn/res/xml/method_ja.xml
deleted file mode 100644
index b633fec..0000000
--- a/overlay/common/packages/inputmethods/OpenWnn/res/xml/method_ja.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2008,2009  OMRON SOFTWARE Co., Ltd.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<!-- The attributes in this XML file provide configuration information -->
-<!-- for the Search Manager. -->
-
-<input-method xmlns:android="http://schemas.android.com/apk/res/android"
-              android:settingsActivity="jp.co.omronsoft.openwnn.OpenWnnControlPanelJAJP"
-              android:isDefault="@bool/im_is_default"
-/>
diff --git a/overlay/common/packages/inputmethods/PinyinIME/res/values/bools.xml b/overlay/common/packages/inputmethods/PinyinIME/res/values/bools.xml
deleted file mode 100644
index 651a9d1..0000000
--- a/overlay/common/packages/inputmethods/PinyinIME/res/values/bools.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<resources>
-  <bool name="im_is_default">false</bool>
-</resources>
diff --git a/overlay/common/packages/providers/ContactsProvider/res/values/unrestricted_packages.xml b/overlay/common/packages/providers/ContactsProvider/res/values/unrestricted_packages.xml
deleted file mode 100644
index bb091ce..0000000
--- a/overlay/common/packages/providers/ContactsProvider/res/values/unrestricted_packages.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-           xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
-    <!-- The list of packages that have access to data that is marked as being restricted -->
-    <string-array name="unrestricted_packages" translatable="false">
-
-        <item>com.android.contacts</item>
-        <item>com.facebook.katana</item>
-        <item>com.android.mms</item>
-        <item>com.google.android.gm</item>
-        <item>com.android.email</item>
-        <item>com.android.phone</item>
-        <item>com.google.android.apps.maps</item>
-        <item>com.google.android.googlequicksearchbox</item>
-        <item>com.android.calendar</item>
-        <item>com.google.android.talk</item>
-        <item>android</item>
-
-    </string-array>
-
-</resources>
diff --git a/overlay/common/vendor/tmobile/apps/ThemeChooser/res/values/config.xml b/overlay/common/vendor/tmobile/apps/ThemeChooser/res/values/config.xml
deleted file mode 100644
index f5f3a03..0000000
--- a/overlay/common/vendor/tmobile/apps/ThemeChooser/res/values/config.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- If set to true, theme change will not apply ringtone or wallpapers
-         from the theme.  Instead, only the system's visual style will be
-         affected.  -->
-    <bool name="config_change_style_only">true</bool>
-</resources>
diff --git a/overlay/crespo/frameworks/base/core/res/res/values/config.xml b/overlay/crespo/frameworks/base/core/res/res/values/config.xml
deleted file mode 100644
index 2d5d72b..0000000
--- a/overlay/crespo/frameworks/base/core/res/res/values/config.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2011, The CyanogenMod Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<resources>
-
-</resources>
diff --git a/overlay/crespo/packages/apps/CMParts/res/values/config.xml b/overlay/crespo/packages/apps/CMParts/res/values/config.xml
deleted file mode 100644
index 0171a73..0000000
--- a/overlay/crespo/packages/apps/CMParts/res/values/config.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- Whether or not to display the trackball settings -->
-    <bool name="has_trackball">false</bool>
-    <bool name="has_rgb_notification_led">false</bool>
-    <bool name="has_camera_button">false</bool>
-    <bool name="has_led_flash">true</bool>
-</resources>
diff --git a/overlay/crespo4g/frameworks/base/core/res/res/values/config.xml b/overlay/crespo4g/frameworks/base/core/res/res/values/config.xml
deleted file mode 100644
index 2d5d72b..0000000
--- a/overlay/crespo4g/frameworks/base/core/res/res/values/config.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2011, The CyanogenMod Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<resources>
-
-</resources>
diff --git a/overlay/crespo4g/packages/apps/CMParts/res/values/config.xml b/overlay/crespo4g/packages/apps/CMParts/res/values/config.xml
deleted file mode 100644
index 0171a73..0000000
--- a/overlay/crespo4g/packages/apps/CMParts/res/values/config.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- Whether or not to display the trackball settings -->
-    <bool name="has_trackball">false</bool>
-    <bool name="has_rgb_notification_led">false</bool>
-    <bool name="has_camera_button">false</bool>
-    <bool name="has_led_flash">true</bool>
-</resources>
diff --git a/overlay/dream_sapphire/packages/apps/ADWLauncher/res/values/config.xml b/overlay/dream_sapphire/packages/apps/ADWLauncher/res/values/config.xml
deleted file mode 100644
index 2238bf5..0000000
--- a/overlay/dream_sapphire/packages/apps/ADWLauncher/res/values/config.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The CyanogenMod Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <bool name="config_drawerAnimated">false</bool>
-    <bool name="config_desktop_indicator">false</bool>
-</resources>
diff --git a/overlay/dream_sapphire/packages/apps/CMParts/res/values/config.xml b/overlay/dream_sapphire/packages/apps/CMParts/res/values/config.xml
deleted file mode 100644
index c345242..0000000
--- a/overlay/dream_sapphire/packages/apps/CMParts/res/values/config.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- Whether or not to display the trackball settings -->
-    <bool name="has_trackball">true</bool>
-    <bool name="has_rgb_notification_led">true</bool>
-</resources>
diff --git a/overlay/droid2/packages/apps/CMParts/res/values/config.xml b/overlay/droid2/packages/apps/CMParts/res/values/config.xml
deleted file mode 100644
index b9582a8..0000000
--- a/overlay/droid2/packages/apps/CMParts/res/values/config.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- Whether or not to display the trackball settings -->
-    <bool name="has_trackball">false</bool>
-    <bool name="has_camera_button">true</bool>
-    <bool name="has_rgb_notification_led">true</bool>
-    <bool name="has_led_flash">true</bool>
-</resources>
diff --git a/overlay/encore/frameworks/base/core/res/res/layout/usb_storage_activity.xml b/overlay/encore/frameworks/base/core/res/res/layout/usb_storage_activity.xml
deleted file mode 100644
index b4625d0..0000000
--- a/overlay/encore/frameworks/base/core/res/res/layout/usb_storage_activity.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/main"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:gravity="center"
-    android:padding="28dip"
-    >
-
-    <ImageView android:id="@+id/icon"
-        android:layout_centerHorizontal="true"
-        android:layout_alignParentTop="true"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:src="@drawable/usb_android" />
-
-    <TextView android:id="@+id/banner"
-        android:layout_centerHorizontal="true"
-        android:layout_below="@id/icon"
-        android:layout_marginTop="10dip"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:textSize="24sp"
-        android:gravity="center"
-        android:text="@string/usb_storage_title" />
-
-    <TextView android:id="@+id/message"
-        android:layout_below="@id/banner"
-        android:layout_marginTop="10dip"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:textSize="20sp"
-        android:gravity="center"
-        android:text="@string/usb_storage_message" />
-
-    <RelativeLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerHorizontal="true"
-        android:layout_alignParentBottom="true"
-        android:layout_marginBottom="16dip"
-        >
-
-        <Button android:id="@+id/mount_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:paddingLeft="18dip"
-            android:paddingRight="18dip"
-            android:text="@string/usb_storage_button_mount"
-            />
-        <Button android:id="@+id/unmount_button"
-            android:visibility="gone"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:paddingLeft="18dip"
-            android:paddingRight="18dip"
-            android:text="@string/usb_storage_stop_button_mount"
-            />
-        <ProgressBar android:id="@+id/progress"
-            android:visibility="gone"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:indeterminate="true"
-            style="?android:attr/progressBarStyle"
-            />
-
-    </RelativeLayout>
-</RelativeLayout>
diff --git a/overlay/encore/packages/apps/CMParts/res/values/config.xml b/overlay/encore/packages/apps/CMParts/res/values/config.xml
deleted file mode 100644
index 22dfadb..0000000
--- a/overlay/encore/packages/apps/CMParts/res/values/config.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- Whether or not to display the trackball settings -->
-    <bool name="has_trackball">false</bool>
-
-    <bool name="has_led_flash">false</bool>
-</resources>
-
diff --git a/overlay/espresso/frameworks/base/core/res/res/values/config.xml b/overlay/espresso/frameworks/base/core/res/res/values/config.xml
deleted file mode 100644
index 2d5d72b..0000000
--- a/overlay/espresso/frameworks/base/core/res/res/values/config.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2011, The CyanogenMod Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<resources>
-
-</resources>
diff --git a/overlay/espresso/packages/apps/CMParts/res/values/config.xml b/overlay/espresso/packages/apps/CMParts/res/values/config.xml
deleted file mode 100644
index 8154cad..0000000
--- a/overlay/espresso/packages/apps/CMParts/res/values/config.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- Whether or not to display the trackball settings -->
-    <bool name="has_trackball">true</bool>
-    <bool name="has_rgb_notification_led">false</bool>
-    <bool name="has_dual_notification_led">true</bool>
-    <bool name="has_camera_button">true</bool>
-    <bool name="has_led_flash">true</bool>
-</resources>
diff --git a/overlay/fascinatemtd/frameworks/base/core/res/res/values/config.xml b/overlay/fascinatemtd/frameworks/base/core/res/res/values/config.xml
deleted file mode 100644
index 8b667e7..0000000
--- a/overlay/fascinatemtd/frameworks/base/core/res/res/values/config.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2009, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-<resources>
-
-    <!-- Component name of the default wallpaper. This will be ImageWallpaper if not 
-         specified -->
-    <string name="default_wallpaper_component">com.android.wallpaper/.nexus.NexusWallpaper</string>
-
-</resources>
diff --git a/overlay/fascinatemtd/packages/apps/CMParts/res/values/config.xml b/overlay/fascinatemtd/packages/apps/CMParts/res/values/config.xml
deleted file mode 100644
index 357f4bf..0000000
--- a/overlay/fascinatemtd/packages/apps/CMParts/res/values/config.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- Whether or not to display the trackball settings -->
-    <bool name="has_trackball">false</bool>
-    <bool name="has_rgb_notification_led">false</bool>
-    <bool name="has_camera_button">false</bool>
-    <bool name="has_led_flash">true</bool>
-    <bool name="has_search_button">true</bool>
-</resources>
diff --git a/overlay/galaxys2/frameworks/base/core/res/res/values/config.xml b/overlay/galaxys2/frameworks/base/core/res/res/values/config.xml
deleted file mode 100644
index bfd07ca..0000000
--- a/overlay/galaxys2/frameworks/base/core/res/res/values/config.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2009, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<resources>
-
-    <!-- Component name of the default wallpaper. This will be ImageWallpaper if not
-         specified -->
-    <string name="default_wallpaper_component">com.android.wallpaper/.nexus.NexusWallpaper</string>
-
-</resources>
diff --git a/overlay/galaxys2/packages/apps/CMParts/res/values/config.xml b/overlay/galaxys2/packages/apps/CMParts/res/values/config.xml
deleted file mode 100644
index 0171a73..0000000
--- a/overlay/galaxys2/packages/apps/CMParts/res/values/config.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- Whether or not to display the trackball settings -->
-    <bool name="has_trackball">false</bool>
-    <bool name="has_rgb_notification_led">false</bool>
-    <bool name="has_camera_button">false</bool>
-    <bool name="has_led_flash">true</bool>
-</resources>
diff --git a/overlay/galaxys2att/frameworks/base/core/res/res/values/config.xml b/overlay/galaxys2att/frameworks/base/core/res/res/values/config.xml
deleted file mode 100644
index bfd07ca..0000000
--- a/overlay/galaxys2att/frameworks/base/core/res/res/values/config.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2009, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<resources>
-
-    <!-- Component name of the default wallpaper. This will be ImageWallpaper if not
-         specified -->
-    <string name="default_wallpaper_component">com.android.wallpaper/.nexus.NexusWallpaper</string>
-
-</resources>
diff --git a/overlay/galaxys2att/packages/apps/CMParts/res/values/config.xml b/overlay/galaxys2att/packages/apps/CMParts/res/values/config.xml
deleted file mode 100644
index 0171a73..0000000
--- a/overlay/galaxys2att/packages/apps/CMParts/res/values/config.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- Whether or not to display the trackball settings -->
-    <bool name="has_trackball">false</bool>
-    <bool name="has_rgb_notification_led">false</bool>
-    <bool name="has_camera_button">false</bool>
-    <bool name="has_led_flash">true</bool>
-</resources>
diff --git a/overlay/galaxysmtd/frameworks/base/core/res/res/values/config.xml b/overlay/galaxysmtd/frameworks/base/core/res/res/values/config.xml
deleted file mode 100644
index 8b667e7..0000000
--- a/overlay/galaxysmtd/frameworks/base/core/res/res/values/config.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2009, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-<resources>
-
-    <!-- Component name of the default wallpaper. This will be ImageWallpaper if not 
-         specified -->
-    <string name="default_wallpaper_component">com.android.wallpaper/.nexus.NexusWallpaper</string>
-
-</resources>
diff --git a/overlay/galaxysmtd/packages/apps/CMParts/res/values/config.xml b/overlay/galaxysmtd/packages/apps/CMParts/res/values/config.xml
deleted file mode 100644
index 59e33ba..0000000
--- a/overlay/galaxysmtd/packages/apps/CMParts/res/values/config.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- Whether or not to display the trackball settings -->
-    <bool name="has_trackball">false</bool>
-    <bool name="has_rgb_notification_led">false</bool>
-    <bool name="has_camera_button">false</bool>
-    <bool name="has_led_flash">false</bool>
-    <bool name="has_search_button">false</bool>
-</resources>
diff --git a/overlay/glacier/frameworks/base/core/res/res/values/config.xml b/overlay/glacier/frameworks/base/core/res/res/values/config.xml
deleted file mode 100644
index 960a389..0000000
--- a/overlay/glacier/frameworks/base/core/res/res/values/config.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2011, The CyanogenMod Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<resources>
-
-    <!-- Component name of the default wallpaper. This will be ImageWallpaper if not
-         specified -->
-    <string name="default_wallpaper_component">com.android.wallpaper/.nexus.NexusWallpaper</string>
-
-</resources>
diff --git a/overlay/glacier/packages/apps/CMParts/res/values/config.xml b/overlay/glacier/packages/apps/CMParts/res/values/config.xml
deleted file mode 100644
index b3b54e6..0000000
--- a/overlay/glacier/packages/apps/CMParts/res/values/config.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- Whether or not to display the trackball settings -->
-    <bool name="has_trackball">true</bool>
-    <bool name="has_rgb_notification_led">false</bool>
-    <bool name="has_led_flash">true</bool>
-    <bool name="has_camera_button">true</bool>
-</resources>
diff --git a/overlay/glacier/packages/apps/Camera/res/values/config.xml b/overlay/glacier/packages/apps/Camera/res/values/config.xml
deleted file mode 100644
index 0103937..0000000
--- a/overlay/glacier/packages/apps/Camera/res/values/config.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2011, The CyanogenMod Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- These resources are around just to allow their values to be customized
-     for different hardware and product builds. -->
-<resources>
-        <!-- FFC parameter filtering -->
-        <bool name="ffc_canFocus">false</bool>
-        <bool name="ffc_canZoom">false</bool>
-        <string name="ffc_supportedEffects">none,mono,sepia,negative,aqua</string>
-
-        <string name="filtered_pictureSizes">2592x1936</string>
-</resources>
-
diff --git a/overlay/heroc/frameworks/base/core/res/res/values/config.xml b/overlay/heroc/frameworks/base/core/res/res/values/config.xml
deleted file mode 100644
index 2d5d72b..0000000
--- a/overlay/heroc/frameworks/base/core/res/res/values/config.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2011, The CyanogenMod Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<resources>
-
-</resources>
diff --git a/overlay/inc/frameworks/base/core/res/res/values/config.xml b/overlay/inc/frameworks/base/core/res/res/values/config.xml
deleted file mode 100644
index 960a389..0000000
--- a/overlay/inc/frameworks/base/core/res/res/values/config.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2011, The CyanogenMod Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<resources>
-
-    <!-- Component name of the default wallpaper. This will be ImageWallpaper if not
-         specified -->
-    <string name="default_wallpaper_component">com.android.wallpaper/.nexus.NexusWallpaper</string>
-
-</resources>
diff --git a/overlay/inc/packages/apps/CMParts/res/values/config.xml b/overlay/inc/packages/apps/CMParts/res/values/config.xml
deleted file mode 100644
index 19ba9c4..0000000
--- a/overlay/inc/packages/apps/CMParts/res/values/config.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- Whether or not to display the trackball settings -->
-    <bool name="has_trackball">true</bool>
-    <bool name="has_rgb_notification_led">false</bool>
-    <bool name="has_dual_notification_led">true</bool>
-
-    <bool name="has_led_flash">true</bool>
-</resources>
diff --git a/overlay/jordan/packages/apps/CMParts/res/values/config.xml b/overlay/jordan/packages/apps/CMParts/res/values/config.xml
deleted file mode 100644
index 0b1ad2e..0000000
--- a/overlay/jordan/packages/apps/CMParts/res/values/config.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- Whether or not to display the trackball settings -->
-    <bool name="has_trackball">false</bool>
-    <bool name="has_camera_button">false</bool>
-    <bool name="has_rgb_notification_led">true</bool>
-    <bool name="has_led_flash">true</bool>
-</resources>
diff --git a/overlay/jordan/packages/apps/Camera/res/values/config.xml b/overlay/jordan/packages/apps/Camera/res/values/config.xml
deleted file mode 100644
index 0469b05..0000000
--- a/overlay/jordan/packages/apps/Camera/res/values/config.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2011, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<resources>
-
-    <!-- Wide media profile available -->
-    <bool name="supportsWideProfile">true</bool>
-
-    <!-- Autofocus parameters -->
-    <string name="touchFocusParameter">mot-areas-to-focus</string>
-    <bool name="touchFocusNeedsRect">true</bool>
-
-</resources>
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/btn_code_lock_default.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/btn_code_lock_default.png
deleted file mode 100644
index 8d5aa0c..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/btn_code_lock_default.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/btn_code_lock_touched.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/btn_code_lock_touched.png
deleted file mode 100644
index 729170b..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/btn_code_lock_touched.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/btn_default_normal.9.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/btn_default_normal.9.png
deleted file mode 100644
index f5692e7..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/btn_default_normal.9.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/btn_default_normal_disable.9.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/btn_default_normal_disable.9.png
deleted file mode 100644
index d5dea60..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/btn_default_normal_disable.9.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/btn_default_normal_disable_focused.9.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/btn_default_normal_disable_focused.9.png
deleted file mode 100644
index 7101938..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/btn_default_normal_disable_focused.9.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/btn_default_pressed.9.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/btn_default_pressed.9.png
deleted file mode 100644
index e033809..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/btn_default_pressed.9.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/btn_default_selected.9.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/btn_default_selected.9.png
deleted file mode 100644
index e6757b5..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/btn_default_selected.9.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/indicator_code_lock_point_area_default.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/indicator_code_lock_point_area_default.png
deleted file mode 100644
index ba173a3..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/indicator_code_lock_point_area_default.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/indicator_code_lock_point_area_green.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/indicator_code_lock_point_area_green.png
deleted file mode 100644
index 09e8b16..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/indicator_code_lock_point_area_green.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/indicator_code_lock_point_area_red.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/indicator_code_lock_point_area_red.png
deleted file mode 100644
index 478ddd1..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/indicator_code_lock_point_area_red.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/scrollbar_handle_accelerated_anim2.9.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/scrollbar_handle_accelerated_anim2.9.png
deleted file mode 100644
index 4febeeb..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/scrollbar_handle_accelerated_anim2.9.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_notify_call_mute.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_notify_call_mute.png
deleted file mode 100644
index b78e654..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_notify_call_mute.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_notify_car_mode.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_notify_car_mode.png
deleted file mode 100644
index 7bd0830..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_notify_car_mode.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_notify_chat.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_notify_chat.png
deleted file mode 100755
index a4000bc..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_notify_chat.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_notify_disk_full.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_notify_disk_full.png
deleted file mode 100644
index 7bb6363..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_notify_disk_full.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_notify_email_generic.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_notify_email_generic.png
deleted file mode 100755
index ecb5737..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_notify_email_generic.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_notify_error.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_notify_error.png
deleted file mode 100644
index ad9fbe3..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_notify_error.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_notify_gmail.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_notify_gmail.png
deleted file mode 100755
index 1c2efd0..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_notify_gmail.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_notify_missed_call.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_notify_missed_call.png
deleted file mode 100644
index 55c050b..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_notify_missed_call.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_notify_more.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_notify_more.png
deleted file mode 100644
index e4c6350..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_notify_more.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_notify_sdcard.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_notify_sdcard.png
deleted file mode 100644
index 1b973db..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_notify_sdcard.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_notify_sdcard_prepare.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_notify_sdcard_prepare.png
deleted file mode 100644
index 0505555..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_notify_sdcard_prepare.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_notify_sdcard_usb.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_notify_sdcard_usb.png
deleted file mode 100644
index 99581f6..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_notify_sdcard_usb.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_notify_sim_toolkit.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_notify_sim_toolkit.png
deleted file mode 100644
index 941f7c2..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_notify_sim_toolkit.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_notify_sync.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_notify_sync.png
deleted file mode 100755
index 92e9a37..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_notify_sync.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_notify_sync_anim0.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_notify_sync_anim0.png
deleted file mode 100755
index 92e9a37..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_notify_sync_anim0.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_notify_sync_error.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_notify_sync_error.png
deleted file mode 100644
index cd64d54..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_notify_sync_error.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_notify_voicemail.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_notify_voicemail.png
deleted file mode 100644
index 9dba516..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_notify_voicemail.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_notify_wifi_in_range.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_notify_wifi_in_range.png
deleted file mode 100644
index a3a521f..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_notify_wifi_in_range.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_adb.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_adb.png
deleted file mode 100644
index 53eb019..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_adb.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_battery_0.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_battery_0.png
deleted file mode 100644
index dc1e856..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_battery_0.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_battery_10.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_battery_10.png
deleted file mode 100644
index 1090b9c..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_battery_10.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_battery_100.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_battery_100.png
deleted file mode 100644
index d0f6522..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_battery_100.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_battery_15.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_battery_15.png
deleted file mode 100644
index 6f7e922..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_battery_15.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_battery_20.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_battery_20.png
deleted file mode 100644
index 214e606..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_battery_20.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_battery_25.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_battery_25.png
deleted file mode 100644
index 8ed4412..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_battery_25.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_battery_30.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_battery_30.png
deleted file mode 100644
index 7d932d4..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_battery_30.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_battery_35.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_battery_35.png
deleted file mode 100644
index e997e81..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_battery_35.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_battery_40.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_battery_40.png
deleted file mode 100644
index f51d112..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_battery_40.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_battery_45.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_battery_45.png
deleted file mode 100644
index 6b34d45..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_battery_45.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_battery_5.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_battery_5.png
deleted file mode 100644
index 9e5a412..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_battery_5.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_battery_50.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_battery_50.png
deleted file mode 100644
index 62fc17d..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_battery_50.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_battery_55.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_battery_55.png
deleted file mode 100644
index 43c96a9..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_battery_55.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_battery_60.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_battery_60.png
deleted file mode 100644
index f8e6f1e..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_battery_60.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_battery_65.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_battery_65.png
deleted file mode 100644
index 2427bcc..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_battery_65.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_battery_70.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_battery_70.png
deleted file mode 100644
index e3d92da..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_battery_70.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_battery_75.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_battery_75.png
deleted file mode 100644
index 2aa5ff2..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_battery_75.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_battery_80.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_battery_80.png
deleted file mode 100644
index e811496..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_battery_80.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_battery_85.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_battery_85.png
deleted file mode 100644
index 21fe968..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_battery_85.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_battery_90.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_battery_90.png
deleted file mode 100644
index 8ba7d88..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_battery_90.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_battery_95.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_battery_95.png
deleted file mode 100644
index abd2d51..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_battery_95.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_battery_charge_anim0.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_battery_charge_anim0.png
deleted file mode 100644
index 8983362..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_battery_charge_anim0.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_battery_charge_anim1.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_battery_charge_anim1.png
deleted file mode 100644
index 7956a09..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_battery_charge_anim1.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_battery_charge_anim2.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_battery_charge_anim2.png
deleted file mode 100644
index 9a1ebdd..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_battery_charge_anim2.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_battery_charge_anim3.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_battery_charge_anim3.png
deleted file mode 100644
index 8379e8d..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_battery_charge_anim3.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_battery_charge_anim4.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_battery_charge_anim4.png
deleted file mode 100644
index 75554a0..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_battery_charge_anim4.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_battery_charge_anim5.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_battery_charge_anim5.png
deleted file mode 100644
index 6492df5..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_battery_charge_anim5.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_battery_unknown.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_battery_unknown.png
deleted file mode 100644
index 701f2d5..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_battery_unknown.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_data_usb.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_data_usb.png
deleted file mode 100644
index ed9c476..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_data_usb.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_download_anim0.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_download_anim0.png
deleted file mode 100644
index ea3d051..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_download_anim0.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_download_anim1.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_download_anim1.png
deleted file mode 100644
index 8d58de7..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_download_anim1.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_download_anim2.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_download_anim2.png
deleted file mode 100644
index 1c8d486..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_download_anim2.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_download_anim3.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_download_anim3.png
deleted file mode 100644
index 9083aeb..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_download_anim3.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_download_anim4.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_download_anim4.png
deleted file mode 100644
index 20cbcc1..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_download_anim4.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_download_anim5.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_download_anim5.png
deleted file mode 100644
index 4695103..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_download_anim5.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_gps_on.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_gps_on.png
deleted file mode 100644
index 50b95c0..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_gps_on.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_headset.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_headset.png
deleted file mode 100644
index df46fac..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_headset.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_phone_call.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_phone_call.png
deleted file mode 100755
index c1e7c98..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_phone_call.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_phone_call_forward.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_phone_call_forward.png
deleted file mode 100755
index 2551b60..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_phone_call_forward.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_phone_call_on_hold.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_phone_call_on_hold.png
deleted file mode 100755
index 9b05743..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_phone_call_on_hold.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_r_signal_0_cdma.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_r_signal_0_cdma.png
deleted file mode 100644
index 003b445..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_r_signal_0_cdma.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_r_signal_1_cdma.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_r_signal_1_cdma.png
deleted file mode 100644
index 1844013..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_r_signal_1_cdma.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_r_signal_2_cdma.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_r_signal_2_cdma.png
deleted file mode 100644
index 6231df9..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_r_signal_2_cdma.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_r_signal_3_cdma.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_r_signal_3_cdma.png
deleted file mode 100644
index 061c346..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_r_signal_3_cdma.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_r_signal_4_cdma.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_r_signal_4_cdma.png
deleted file mode 100644
index c3879ea..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_r_signal_4_cdma.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_ra_signal_0_cdma.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_ra_signal_0_cdma.png
deleted file mode 100644
index 4bc92ed..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_ra_signal_0_cdma.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_ra_signal_1_cdma.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_ra_signal_1_cdma.png
deleted file mode 100644
index bc9ecd6..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_ra_signal_1_cdma.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_ra_signal_2_cdma.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_ra_signal_2_cdma.png
deleted file mode 100644
index aae6568..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_ra_signal_2_cdma.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_ra_signal_3_cdma.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_ra_signal_3_cdma.png
deleted file mode 100644
index 46eaaec..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_ra_signal_3_cdma.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_ra_signal_4_cdma.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_ra_signal_4_cdma.png
deleted file mode 100644
index f961f6c..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_ra_signal_4_cdma.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_secure.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_secure.png
deleted file mode 100644
index ce8e4b4..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_secure.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_signal_0_cdma.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_signal_0_cdma.png
deleted file mode 100644
index 1895d26..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_signal_0_cdma.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_signal_1_cdma.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_signal_1_cdma.png
deleted file mode 100644
index 4eec9d3..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_signal_1_cdma.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_signal_2_cdma.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_signal_2_cdma.png
deleted file mode 100644
index f033ba5..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_signal_2_cdma.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_signal_3_cdma.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_signal_3_cdma.png
deleted file mode 100644
index 39d16c6..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_signal_3_cdma.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_signal_4_cdma.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_signal_4_cdma.png
deleted file mode 100644
index 413f52a..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_signal_4_cdma.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_signal_evdo_0.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_signal_evdo_0.png
deleted file mode 100644
index 9a1730e..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_signal_evdo_0.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_signal_evdo_1.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_signal_evdo_1.png
deleted file mode 100644
index d9fa62e..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_signal_evdo_1.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_signal_evdo_2.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_signal_evdo_2.png
deleted file mode 100644
index 8091efe..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_signal_evdo_2.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_signal_evdo_3.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_signal_evdo_3.png
deleted file mode 100644
index f86455f..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_signal_evdo_3.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_signal_evdo_4.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_signal_evdo_4.png
deleted file mode 100644
index 7475702..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_signal_evdo_4.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_speakerphone.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_speakerphone.png
deleted file mode 100755
index 10e32a8..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_speakerphone.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_tether_bluetooth.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_tether_bluetooth.png
deleted file mode 100644
index 97ef448..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_tether_bluetooth.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_tether_general.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_tether_general.png
deleted file mode 100755
index 4bbae3a..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_tether_general.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_tether_usb.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_tether_usb.png
deleted file mode 100644
index 7db8556..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_tether_usb.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_tether_wifi.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_tether_wifi.png
deleted file mode 100644
index 0d3df25..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_tether_wifi.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_throttled.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_throttled.png
deleted file mode 100644
index dcc0d26..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_throttled.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_upload_anim0.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_upload_anim0.png
deleted file mode 100644
index 77b27ec..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_upload_anim0.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_upload_anim1.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_upload_anim1.png
deleted file mode 100644
index 3f36019..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_upload_anim1.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_upload_anim2.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_upload_anim2.png
deleted file mode 100644
index 55c2737..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_upload_anim2.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_upload_anim3.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_upload_anim3.png
deleted file mode 100644
index 1729754..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_upload_anim3.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_upload_anim4.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_upload_anim4.png
deleted file mode 100644
index 0775f4d..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_upload_anim4.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_upload_anim5.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_upload_anim5.png
deleted file mode 100644
index 438f8ef..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_upload_anim5.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_vp_phone_call.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_vp_phone_call.png
deleted file mode 100755
index 6ddf07c..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_vp_phone_call.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_vp_phone_call_on_hold.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_vp_phone_call_on_hold.png
deleted file mode 100755
index 9074a35..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_vp_phone_call_on_hold.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_warning.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_warning.png
deleted file mode 100644
index 8f5bb08..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_warning.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/status_bar_header_background.9.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/status_bar_header_background.9.png
deleted file mode 100644
index 35c7589..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/status_bar_header_background.9.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/status_bar_item_app_background_normal.9.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/status_bar_item_app_background_normal.9.png
deleted file mode 100644
index 638b6e6..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/status_bar_item_app_background_normal.9.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/status_bar_item_background_focus.9.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/status_bar_item_background_focus.9.png
deleted file mode 100644
index 45afa5e..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/status_bar_item_background_focus.9.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/status_bar_item_background_normal.9.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/status_bar_item_background_normal.9.png
deleted file mode 100644
index 6b6ea28..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/status_bar_item_background_normal.9.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/status_bar_item_background_pressed.9.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/status_bar_item_background_pressed.9.png
deleted file mode 100644
index 47a1198..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/status_bar_item_background_pressed.9.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/tab_focus.9.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/tab_focus.9.png
deleted file mode 100644
index dd667ae..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/tab_focus.9.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/tab_focus_bar_left.9.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/tab_focus_bar_left.9.png
deleted file mode 100644
index 9783fac..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/tab_focus_bar_left.9.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/tab_focus_bar_right.9.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/tab_focus_bar_right.9.png
deleted file mode 100644
index 9783fac..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/tab_focus_bar_right.9.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/tab_press.9.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/tab_press.9.png
deleted file mode 100644
index 760acb7..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/tab_press.9.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/tab_press_bar_left.9.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/tab_press_bar_left.9.png
deleted file mode 100644
index ca953dc..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/tab_press_bar_left.9.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/tab_press_bar_right.9.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/tab_press_bar_right.9.png
deleted file mode 100644
index ca953dc..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/tab_press_bar_right.9.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/tab_selected.9.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/tab_selected.9.png
deleted file mode 100644
index c364580..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/tab_selected.9.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/tab_selected_bar_left.9.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/tab_selected_bar_left.9.png
deleted file mode 100644
index da2bc35..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/tab_selected_bar_left.9.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/tab_selected_bar_left_v4.9.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/tab_selected_bar_left_v4.9.png
deleted file mode 100644
index ff89832..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/tab_selected_bar_left_v4.9.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/tab_selected_bar_right.9.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/tab_selected_bar_right.9.png
deleted file mode 100644
index 4b37715..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/tab_selected_bar_right.9.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/tab_selected_bar_right_v4.9.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/tab_selected_bar_right_v4.9.png
deleted file mode 100644
index ff89832..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/tab_selected_bar_right_v4.9.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/tab_selected_v4.9.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/tab_selected_v4.9.png
deleted file mode 100644
index 4f582dd..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/tab_selected_v4.9.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/tab_unselected.9.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/tab_unselected.9.png
deleted file mode 100644
index accfef3..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/tab_unselected.9.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/tab_unselected_v4.9.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/tab_unselected_v4.9.png
deleted file mode 100644
index e63e396..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/tab_unselected_v4.9.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/usb_android.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/usb_android.png
deleted file mode 100644
index 7eab4ff..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/usb_android.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/usb_android_connected.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/usb_android_connected.png
deleted file mode 100644
index 3ce5498..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/usb_android_connected.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/core/res/res/layout/global_actions_item.xml b/overlay/ldpi/frameworks/base/core/res/res/layout/global_actions_item.xml
deleted file mode 100644
index 289e6ea..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/layout/global_actions_item.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="?android:attr/listPreferredItemHeight"
-
-    android:paddingLeft="11dip"
-    android:paddingTop="4dip"
-    android:paddingBottom="4dip"
-    >
-
-    <ImageView android:id="@+id/icon"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_alignParentTop="true"
-        android:layout_alignParentBottom="true"
-        android:layout_marginRight="9dip"
-            />
-
-
-    <TextView android:id="@+id/status"
-        android:layout_width="match_parent"
-        android:layout_height="22dip"
-
-        android:layout_toRightOf="@id/icon"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentRight="true"
-
-        android:textAppearance="?android:attr/textAppearanceSmallInverse"
-        />
-
-
-    <TextView android:id="@+id/message"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-
-        android:layout_toRightOf="@id/icon"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentTop="true"
-        android:layout_above="@id/status"
-        android:layout_alignWithParentIfMissing="true"
-        android:gravity="center_vertical"
-        android:textAppearance="?android:attr/textAppearanceLargeInverse"
-        />
-
-
-</RelativeLayout>
diff --git a/overlay/ldpi/frameworks/base/core/res/res/layout/keyguard_screen_password_portrait.xml b/overlay/ldpi/frameworks/base/core/res/res/layout/keyguard_screen_password_portrait.xml
deleted file mode 100644
index 2013c68..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/layout/keyguard_screen_password_portrait.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-**
-** Copyright 2008, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License")
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:background="#70000000"
-    android:id="@+id/password"
-    android:gravity="center_horizontal">
-
-    <!-- "Enter PIN(Password) to unlock" -->
-    <TextView android:id="@+id/enter_password_label"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:layout_marginRight="6dip"
-        android:layout_marginLeft="6dip"
-        android:layout_marginTop="5dip"
-        android:layout_marginBottom="5dip"
-        android:gravity="center"
-        android:text="@android:string/keyguard_password_enter_password_code"
-        android:textAppearance="?android:attr/textAppearanceLarge"
-    />
-
-    <!-- spacer above text entry field -->
-    <View
-        android:id="@+id/spacerBottom"
-        android:layout_width="fill_parent"
-        android:layout_height="1dip"
-        android:layout_marginTop="6dip"
-        android:background="@android:drawable/divider_horizontal_dark"
-    />
-
-    <!-- Password entry field -->
-    <EditText android:id="@+id/passwordEntry"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:singleLine="true"
-        android:textStyle="bold"
-        android:inputType="textPassword"
-        android:gravity="center"
-        android:layout_gravity="center"
-        android:textSize="32sp"
-        android:layout_marginTop="3dip"
-        android:layout_marginLeft="30dip"
-        android:layout_marginRight="30dip"
-        android:textAppearance="?android:attr/textAppearanceLarge"
-        android:background="@drawable/password_field_default"
-        android:textColor="#ffffffff"
-    />
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="0dip"
-        android:layout_weight="1" />
-
-    <!-- Alphanumeric keyboard -->
-    <com.android.internal.widget.PasswordEntryKeyboardView android:id="@+id/keyboard"
-        android:layout_alignParentBottom="true"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="#00000000"
-        android:keyBackground="@drawable/btn_keyboard_key_fulltrans"
-    />
-
-    <!-- emergency call button -->
-    <Button
-        android:id="@+id/emergencyCall"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:drawableLeft="@drawable/ic_emergency"
-        android:drawablePadding="8dip"
-        android:layout_marginTop="5dip"
-        android:layout_marginBottom="20dip"
-        android:text="@string/lockscreen_emergency_call"
-        style="@style/Widget.Button.Transparent"
-    />
-</LinearLayout>
diff --git a/overlay/ldpi/frameworks/base/core/res/res/layout/keyguard_screen_sim_pin_portrait.xml b/overlay/ldpi/frameworks/base/core/res/res/layout/keyguard_screen_sim_pin_portrait.xml
deleted file mode 100644
index 48a694f..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/layout/keyguard_screen_sim_pin_portrait.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-**
-** Copyright 2008, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License")
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:background="@android:color/background_dark"
-    android:gravity="center_horizontal">
-
-    <LinearLayout android:id="@+id/topDisplayGroup"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
-
-        <!-- header text ('Enter Pin Code') -->
-        <TextView android:id="@+id/headerText"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:singleLine="true"
-            android:textAppearance="?android:attr/textAppearanceLarge"/>
-
-        <!-- Carrier info -->
-        <TextView android:id="@+id/carrier"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="2dip"
-            android:layout_marginBottom="2dip"
-            android:gravity="center"
-            android:singleLine="true"
-            android:ellipsize="marquee"
-            android:textAppearance="?android:attr/textAppearanceMedium"/>
-
-        <!-- password entry -->
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:layout_marginRight="6dip"
-            android:layout_marginLeft="6dip"
-            android:gravity="center_vertical"
-            android:background="@android:drawable/edit_text">
-
-            <!-- displays dots as user enters pin -->
-            <TextView android:id="@+id/pinDisplay"
-                android:layout_width="0dip"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:maxLines="1"
-                android:textAppearance="?android:attr/textAppearanceLargeInverse"
-                android:textStyle="bold"
-                android:inputType="textPassword"
-            />
-
-            <ImageButton android:id="@+id/backspace"
-                android:src="@android:drawable/ic_input_delete"
-                android:layout_width="48.0dip"
-                android:layout_height="48.0dip"
-                android:layout_marginRight="-3dip"
-                android:layout_marginBottom="-3dip"
-            />
-        </LinearLayout>
-
-    </LinearLayout>
-
-    <include
-        android:id="@+id/keyPad"
-        layout="@android:layout/twelve_key_entry"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/topDisplayGroup"
-        android:layout_marginTop="3dip"
-        android:layout_marginBottom="3dip"
-    />
-
-    <!-- spacer below keypad -->
-    <View
-        android:id="@+id/spacerBottom"
-        android:layout_width="match_parent"
-        android:layout_height="1dip"
-        android:layout_above="@id/emergencyCall"
-        android:background="@android:drawable/divider_horizontal_dark"
-    />
-
-    <!-- The emergency button should take the rest of the space and be centered vertically -->
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="0dip"
-        android:layout_weight="1"
-        android:gravity="center"
-        android:orientation="vertical">
-
-        <!-- emergency call button -->
-        <Button
-            android:id="@+id/emergencyCall"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:drawableLeft="@android:drawable/ic_emergency"
-            android:drawablePadding="8dip"
-            android:text="@android:string/lockscreen_emergency_call"
-        />
-    </LinearLayout>
-
-</LinearLayout>
diff --git a/overlay/ldpi/frameworks/base/core/res/res/layout/keyguard_screen_tab_unlock.xml b/overlay/ldpi/frameworks/base/core/res/res/layout/keyguard_screen_tab_unlock.xml
deleted file mode 100644
index ce8bc99..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/layout/keyguard_screen_tab_unlock.xml
+++ /dev/null
@@ -1,286 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-**
-** Copyright 2009, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License")
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- This is the general lock screen which shows information about the
-  state of the device, as well as instructions on how to get past it
-  depending on the state of the device.  It is the same for landscape
-  and portrait.-->
-<android.gesture.GestureOverlayView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/gestures"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:gestureStrokeType="multiple"
-    android:eventsInterceptionEnabled="false"
-    android:orientation="none">
-    <RelativeLayout
-        xmlns:tabunlock="http://schemas.android.com/apk/res/com.android.tabunlock"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="#70000000"
-        android:gravity="center_horizontal"
-        android:id="@+id/root">
-
-        <TextView
-            android:id="@+id/carrier"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentTop="true"
-            android:layout_alignParentRight="true"
-            android:layout_marginTop="2dip"
-            android:layout_marginRight="8dip"
-            android:singleLine="true"
-            android:ellipsize="marquee"
-            android:gravity="right|bottom"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            />
-
-        <!-- "emergency calls only" shown when sim is missing or PUKd -->
-        <TextView
-            android:id="@+id/emergencyCallText"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/carrier"
-            android:layout_alignParentRight="true"
-            android:layout_marginTop="0dip"
-            android:layout_marginRight="8dip"
-            android:text="@string/emergency_calls_only"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:textColor="@color/white"
-            />
-
-    <!-- time and date -->
-        <com.android.internal.widget.DigitalClock android:id="@+id/time"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/carrier"
-            android:layout_marginTop="22dip"
-            android:layout_marginLeft="20dip"
-            android:paddingBottom="2dip"
-            >
-
-            <TextView android:id="@+id/timeDisplay"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:singleLine="true"
-                android:ellipsize="none"
-                android:textSize="68sp"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:shadowColor="#C0000000"
-                android:shadowDx="0"
-                android:shadowDy="0"
-                android:shadowRadius="3.0"
-                android:layout_marginBottom="0dip"
-                />
-
-            <TextView android:id="@+id/am_pm"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_toRightOf="@id/timeDisplay"
-                android:layout_alignBaseline="@id/timeDisplay"
-                android:singleLine="true"
-                android:ellipsize="none"
-                android:textSize="22sp"
-                android:layout_marginLeft="8dip"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:shadowColor="#C0000000"
-                android:shadowDx="0"
-                android:shadowDy="0"
-                android:shadowRadius="3.0"
-                />
-        </com.android.internal.widget.DigitalClock>
-
-        <TextView
-            android:id="@+id/date"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/time"
-            android:layout_marginLeft="24dip"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            />
-
-        <TextView
-            android:id="@+id/status1"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/date"
-            android:layout_marginTop="4dip"
-            android:layout_marginLeft="24dip"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:drawablePadding="4dip"
-            />
-
-        <TextView
-            android:id="@+id/status2"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/status1"
-            android:layout_marginTop="0dip"
-            android:layout_marginLeft="24dip"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:drawablePadding="4dip"
-            />
-
-        <TextView
-            android:id="@+id/customMsg"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="0dip"
-            android:layout_marginLeft="24dip"
-            android:layout_marginRight="24dip"
-            android:layout_below="@id/status2"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            />
-
-        <TextView
-            android:id="@+id/screenLocked"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/customMsg"
-            android:layout_marginLeft="24dip"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:layout_marginTop="2dip"
-            android:drawablePadding="4dip"
-            />
-
-        <!-- album art -->
-        <ImageButton android:id="@+id/albumArt"
-            android:layout_width="105dip"
-            android:layout_height="105dip"
-            android:layout_below="@+id/musicNowPlaying"
-            android:layout_centerInParent="true"
-            android:layout_marginTop="22dip"
-            android:adjustViewBounds="true"
-            android:background="@color/transparent"
-            android:scaleType="fitCenter"
-            android:padding = "3px"
-            android:visibility="gone"
-            />
-
-        <com.android.internal.widget.SlidingTab
-            android:id="@+id/tab_selector2"
-            android:orientation="horizontal"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
-            android:layout_marginBottom="128dip"
-            />
-
-        <com.android.internal.widget.SlidingTab
-            android:id="@+id/tab_selector"
-            android:orientation="horizontal"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
-            android:layout_marginBottom="40dip"
-            />
-
-        <com.android.internal.widget.RotarySelector
-            android:id="@+id/rotary_selector"
-            android:orientation="horizontal"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
-            />
-
-        <com.android.internal.widget.RingSelector
-            android:id="@+id/ring_selector"
-            android:orientation="horizontal"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_alignParentBottom="true"
-            />
-
-        <!-- emergency call button shown when sim is PUKd and tab_selector is
-             hidden -->
-        <Button
-            android:id="@+id/emergencyCallButton"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:drawableLeft="@drawable/ic_emergency"
-            android:layout_centerInParent="true"
-            android:layout_alignParentBottom="true"
-            android:layout_marginBottom="62dip"
-            style="@style/Widget.Button.Transparent"
-            android:drawablePadding="8dip"
-            android:visibility="gone"
-            />
-
-        <!-- music control buttons -->
-        <ImageButton
-            android:id="@+id/musicControlPlay"
-            android:src="@drawable/ic_media_play"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
-            android:layout_alignParentBottom="true"
-            android:padding="10px"
-            android:background="@color/transparent"
-            android:visibility="gone"
-            />
-        <ImageButton
-            android:id="@+id/musicControlPause"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:src="@drawable/ic_media_pause"
-            android:layout_centerInParent="true"
-            android:layout_alignParentBottom="true"
-            android:padding="10px"
-            android:background="@color/transparent"
-            android:visibility="gone"
-            />
-        <ImageButton
-            android:id="@+id/musicControlPrevious"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:src="@drawable/ic_media_previous"
-            android:layout_alignParentBottom="true"
-            android:layout_marginRight="20dip"
-            android:padding="10px"
-            android:layout_toLeftOf="@+id/musicControlPause"
-            android:background="@color/transparent"
-            android:visibility="gone"
-            />
-        <ImageButton
-            android:id="@+id/musicControlNext"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:src="@drawable/ic_media_next"
-            android:layout_alignParentBottom="true"
-            android:layout_marginLeft="20dip"
-            android:padding="10px"
-            android:layout_toRightOf="@+id/musicControlPause"
-            android:background="@color/transparent"
-            android:visibility="gone"
-            />
-        <TextView
-            android:id="@+id/musicNowPlaying"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
-            android:lines="1"
-            android:scrollHorizontally="true"
-            android:ellipsize="marquee"
-            android:paddingTop="10dip"
-            android:gravity="bottom"
-            android:layout_alignWithParentIfMissing="true"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            />
-    </RelativeLayout>
-</android.gesture.GestureOverlayView>
diff --git a/overlay/ldpi/frameworks/base/core/res/res/layout/keyguard_screen_unlock_portrait.xml b/overlay/ldpi/frameworks/base/core/res/res/layout/keyguard_screen_unlock_portrait.xml
deleted file mode 100644
index b51de94..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/layout/keyguard_screen_unlock_portrait.xml
+++ /dev/null
@@ -1,223 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-**
-** Copyright 2008, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License")
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- This is the screen that shows the 9 circle unlock widget and instructs
-     the user how to unlock their device, or make an emergency call.  This
-     is the portrait layout.  -->
-<com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:gravity="center_horizontal"
-    android:background="#70000000"
-    android:id="@+id/pattern"
-    >
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        >
-        <TextView
-            android:id="@+id/carrier"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentTop="true"
-            android:layout_marginTop="2dip"
-            android:layout_alignParentRight="true"
-            android:layout_marginRight="8dip"
-            android:layout_toRightOf="@+id/time"
-            android:singleLine="true"
-            android:ellipsize="marquee"
-            android:gravity="right|bottom"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            />
-
-        <com.android.internal.widget.DigitalClock android:id="@+id/time"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentLeft="true"
-            android:layout_alignParentTop="true"
-            android:layout_marginTop="6dip"
-            android:layout_marginLeft="8dip"
-            >
-
-            <TextView android:id="@+id/timeDisplay"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:gravity="bottom"
-                android:singleLine="true"
-                android:ellipsize="none"
-                android:textSize="38sp"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:shadowColor="#C0000000"
-                android:shadowDx="0"
-                android:shadowDy="0"
-                android:shadowRadius="3.0"
-                android:layout_marginBottom="0dip"
-                />
-
-            <TextView android:id="@+id/am_pm"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:gravity="bottom"
-                android:singleLine="true"
-                android:ellipsize="none"
-                android:textSize="12sp"
-                android:layout_marginLeft="4dip"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:shadowColor="#C0000000"
-                android:shadowDx="0"
-                android:shadowDy="0"
-                android:shadowRadius="3.0"
-                />
-
-        </com.android.internal.widget.DigitalClock>
-
-        <TextView
-            android:id="@+id/date"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/time"
-            android:layout_marginLeft="12dip"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            />
-
-    </RelativeLayout>
-
-    <View
-        android:id="@+id/divider"
-        android:layout_width="match_parent"
-        android:layout_height="1dip"
-        android:layout_marginTop="4dip"
-        android:layout_marginBottom="4dip"
-        android:background="@android:drawable/divider_horizontal_dark"
-        />
-
-    <!-- used for instructions such as "draw pattern to unlock", the next alarm, and charging
-         status.  -->
-    <LinearLayout
-        android:orientation="horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="0dip"
-        android:layout_marginLeft="12dip"
-        android:gravity="left"
-        >
-        <TextView
-            android:id="@+id/status1"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:textSize="16sp"
-            android:drawablePadding="4dip"
-            android:singleLine="true"
-            />
-        <TextView
-            android:id="@+id/statusSep"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="5dip"
-            android:layout_marginRight="5dip"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:textSize="16sp"
-            android:singleLine="true"
-            />
-        <TextView
-            android:id="@+id/status2"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentTop="true"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:textSize="16sp"
-            android:drawablePadding="4dip"
-            android:singleLine="true"
-            />
-    </LinearLayout>
-
-    <com.android.internal.widget.LockPatternView
-        android:id="@+id/lockPattern"
-        android:layout_width="match_parent"
-        android:layout_height="0dip"
-        android:layout_weight="1"
-        android:layout_marginTop="2dip"
-        android:layout_marginRight="30dip"
-        android:layout_marginLeft="30dip"
-        android:aspect="@string/lock_pattern_view_aspect"
-         />
-
-    <!-- footer -->
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        >
-
-        <!-- option 1: a single emergency call button -->
-        <RelativeLayout android:id="@+id/footerNormal"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            >
-            <Button android:id="@+id/emergencyCallAlone"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerInParent="true"
-                android:text="@string/lockscreen_emergency_call"
-                style="@style/Widget.Button.Transparent"
-                android:drawableLeft="@drawable/ic_emergency"
-                android:drawablePadding="8dip"
-                />
-
-        </RelativeLayout>
-
-        <!-- option 2: an emergency call button, and a 'forgot pattern?' button -->
-        <LinearLayout android:id="@+id/footerForgotPattern"
-            android:orientation="horizontal"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:gravity="center"
-            >
-            <Button android:id="@+id/emergencyCallTogether"
-                android:layout_width="0dip"
-                android:layout_height="match_parent"
-                android:layout_weight="1.0"
-                android:layout_marginTop="4dip"
-                android:layout_marginBottom="4dip"
-                android:layout_marginLeft="4dip"
-                android:layout_marginRight="2dip"
-                android:text="@string/lockscreen_emergency_call"
-                style="@style/Widget.Button.Transparent"
-                android:drawableLeft="@drawable/ic_emergency"
-                android:drawablePadding="8dip"
-                />
-            <Button android:id="@+id/forgotPattern"
-                android:layout_width="0dip"
-                android:layout_height="match_parent"
-                android:layout_weight="1.0"
-                android:layout_marginTop="4dip"
-                android:layout_marginBottom="4dip"
-                android:layout_marginLeft="2dip"
-                android:layout_marginRight="4dip"
-                style="@style/Widget.Button.Transparent"
-                android:visibility="invisible"
-                />
-        </LinearLayout>
-
-    </FrameLayout>
-
-</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
\ No newline at end of file
diff --git a/overlay/ldpi/frameworks/base/core/res/res/layout/preference_dialog_edittext.xml b/overlay/ldpi/frameworks/base/core/res/res/layout/preference_dialog_edittext.xml
deleted file mode 100644
index 637eda9..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/layout/preference_dialog_edittext.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2006 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Layout used as the dialog's content View for EditTextPreference. -->
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <LinearLayout
-        android:id="@+android:id/edittext_container"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:padding="0dip"
-        android:orientation="vertical">
-
-        <TextView android:id="@+android:id/message"
-            style="?android:attr/textAppearanceSmall"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:textColor="?android:attr/textColorSecondary" />
-
-    </LinearLayout>
-
-</ScrollView>
diff --git a/overlay/ldpi/frameworks/base/core/res/res/layout/twelve_key_entry.xml b/overlay/ldpi/frameworks/base/core/res/res/layout/twelve_key_entry.xml
deleted file mode 100644
index 4555b91..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/layout/twelve_key_entry.xml
+++ /dev/null
@@ -1,181 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2008, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- This is not a standalone element it can be included into apps that need 12-key input -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="50dip"
-        android:layout_marginLeft="2dip"
-        android:layout_marginRight="2dip"
-        android:orientation="horizontal">
-
-        <Button android:id="@+id/one"
-            android:layout_width="0sp"
-            android:layout_height="fill_parent"
-            android:layout_weight="1"
-            android:layout_marginLeft="2dip"
-            android:layout_marginRight="2dip"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:textStyle="bold"
-        />
-
-        <Button android:id="@+id/two"
-            android:layout_width="0sp"
-            android:layout_height="fill_parent"
-            android:layout_weight="1"
-            android:layout_marginLeft="2dip"
-            android:layout_marginRight="2dip"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:textStyle="bold"
-        />
-
-        <Button android:id="@+id/three"
-            android:layout_width="0sp"
-            android:layout_height="fill_parent"
-            android:layout_weight="1"
-            android:layout_marginLeft="2dip"
-            android:layout_marginRight="2dip"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:textStyle="bold"
-        />
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="50dip"
-        android:layout_marginLeft="2dip"
-        android:layout_marginRight="2dip"
-        android:orientation="horizontal">
-
-        <Button android:id="@+id/four"
-            android:layout_width="0sp"
-            android:layout_height="fill_parent"
-            android:layout_weight="1"
-            android:layout_marginLeft="2dip"
-            android:layout_marginRight="2dip"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:textStyle="bold"
-        />
-
-        <Button android:id="@+id/five"
-            android:layout_width="0sp"
-            android:layout_height="fill_parent"
-            android:layout_weight="1"
-            android:layout_marginLeft="2dip"
-            android:layout_marginRight="2dip"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:textStyle="bold"
-        />
-
-        <Button android:id="@+id/six"
-            android:layout_width="0sp"
-            android:layout_height="fill_parent"
-            android:layout_weight="1"
-            android:layout_marginLeft="2dip"
-            android:layout_marginRight="2dip"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:textStyle="bold"
-        />
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="50dip"
-        android:layout_marginLeft="2dip"
-        android:layout_marginRight="2dip"
-        android:orientation="horizontal">
-
-        <Button android:id="@+id/seven"
-            android:layout_width="0sp"
-            android:layout_height="fill_parent"
-            android:layout_weight="1"
-            android:layout_marginLeft="2dip"
-            android:layout_marginRight="2dip"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:textStyle="bold"
-        />
-
-        <Button android:id="@+id/eight"
-            android:layout_width="0sp"
-            android:layout_height="fill_parent"
-            android:layout_weight="1"
-            android:layout_marginLeft="2dip"
-            android:layout_marginRight="2dip"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:textStyle="bold"
-        />
-
-        <Button android:id="@+id/nine"
-            android:layout_width="0sp"
-            android:layout_height="fill_parent"
-            android:layout_weight="1"
-            android:layout_marginLeft="2dip"
-            android:layout_marginRight="2dip"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:textStyle="bold"
-        />
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="50dip"
-        android:layout_marginLeft="2dip"
-        android:layout_marginRight="2dip"
-        android:orientation="horizontal">
-
-        <Button android:id="@+id/ok"
-            android:layout_width="0sp"
-            android:layout_height="fill_parent"
-            android:layout_weight="1"
-            android:layout_marginLeft="2dip"
-            android:layout_marginRight="2dip"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:textStyle="bold"
-            android:text="@android:string/ok"
-        />
-
-        <Button android:id="@+id/zero"
-            android:layout_width="0sp"
-            android:layout_height="fill_parent"
-            android:layout_weight="1"
-            android:layout_marginLeft="2dip"
-            android:layout_marginRight="2dip"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:textStyle="bold"
-        />
-
-        <Button android:id="@+id/cancel"
-            android:layout_width="0sp"
-            android:layout_height="fill_parent"
-            android:layout_weight="1"
-            android:layout_marginLeft="2dip"
-            android:layout_marginRight="2dip"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:textStyle="bold"
-            android:text="@android:string/cancel"
-        />
-
-    </LinearLayout>
-
-</LinearLayout>
diff --git a/overlay/ldpi/frameworks/base/core/res/res/values/dimens.xml b/overlay/ldpi/frameworks/base/core/res/res/values/dimens.xml
deleted file mode 100644
index cfac39d..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/values/dimens.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/apps/common/assets/res/any/dimens.xml
-**
-** Copyright 2006, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<resources>
-    <!-- The width that is used when creating thumbnails of applications. -->
-    <dimen name="thumbnail_width">0dp</dimen>
-    <!-- The height that is used when creating thumbnails of applications. -->
-    <dimen name="thumbnail_height">0dp</dimen>
-    <!-- The standard size (both width and height) of an application icon that
-         will be displayed in the app launcher and elsewhere. -->
-    <dimen name="app_icon_size">48dip</dimen>
-    <dimen name="toast_y_offset">64dip</dimen>
-    <!-- Height of the status bar -->
-    <dimen name="status_bar_height">25dip</dimen>
-    <!-- Height of the status bar -->
-    <dimen name="status_bar_icon_size">25dip</dimen>
-    <!-- Margin at the edge of the screen to ignore touch events for in the windowshade. -->
-    <dimen name="status_bar_edge_ignore">5dp</dimen>
-    <!-- Size of the fastscroll hint letter -->
-    <dimen name="fastscroll_overlay_size">104dp</dimen>
-    <!-- Width of the fastscroll thumb -->
-    <dimen name="fastscroll_thumb_width">64dp</dimen>
-    <!-- Height of the fastscroll thumb -->
-    <dimen name="fastscroll_thumb_height">52dp</dimen>
-    <!-- Default height of a key in the password keyboard -->
-    <dimen name="password_keyboard_key_height">46dip</dimen>
-    <!-- Default correction for the space key in the password keyboard -->
-    <dimen name="password_keyboard_spacebar_vertical_correction">4dip</dimen>
-</resources>
diff --git a/overlay/ldpi/frameworks/base/core/res/res/values/styles.xml b/overlay/ldpi/frameworks/base/core/res/res/values/styles.xml
deleted file mode 100644
index 6cc50b5..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/values/styles.xml
+++ /dev/null
@@ -1,879 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2006 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <!-- Global Theme Styles -->
-    <eat-comment />
-
-
-    <style name="WindowTitleBackground">
-        <item name="android:background">@android:drawable/title_bar</item>
-    </style>
-
-    <style name="WindowTitle">
-        <item name="android:singleLine">true</item>
-        <item name="android:textAppearance">@style/TextAppearance.WindowTitle</item>
-        <item name="android:shadowColor">#BB000000</item>
-        <item name="android:shadowRadius">2.75</item>
-    </style>
-
-    <style name="DialogWindowTitle">
-        <item name="android:maxLines">1</item>
-        <item name="android:scrollHorizontally">true</item>
-        <item name="android:textAppearance">@style/TextAppearance.DialogWindowTitle</item>
-    </style>
-
-    <style name="AlertDialog">
-        <item name="fullDark">@android:drawable/popup_full_dark</item>
-        <item name="topDark">@android:drawable/popup_top_dark</item>
-        <item name="centerDark">@android:drawable/popup_center_dark</item>
-        <item name="bottomDark">@android:drawable/popup_bottom_dark</item>
-        <item name="fullBright">@android:drawable/popup_full_bright</item>
-        <item name="topBright">@android:drawable/popup_top_bright</item>
-        <item name="centerBright">@android:drawable/popup_center_bright</item>
-        <item name="bottomBright">@android:drawable/popup_bottom_bright</item>
-        <item name="bottomMedium">@android:drawable/popup_bottom_medium</item>
-        <item name="centerMedium">@android:drawable/popup_center_medium</item>
-    </style>
-
-    <!-- Base style for animations.  This style specifies no animations. -->
-    <style name="Animation" />
-
-    <!-- Standard animations for a full-screen window or activity. -->
-    <style name="Animation.Activity">
-        <item name="activityOpenEnterAnimation">@anim/activity_open_enter</item>
-        <item name="activityOpenExitAnimation">@anim/activity_open_exit</item>
-        <item name="activityCloseEnterAnimation">@anim/activity_close_enter</item>
-        <item name="activityCloseExitAnimation">@anim/activity_close_exit</item>
-        <item name="taskOpenEnterAnimation">@anim/task_open_enter</item>
-        <item name="taskOpenExitAnimation">@anim/task_open_exit</item>
-        <item name="taskCloseEnterAnimation">@anim/task_close_enter</item>
-        <item name="taskCloseExitAnimation">@anim/task_close_exit</item>
-        <item name="taskToFrontEnterAnimation">@anim/task_open_enter</item>
-        <item name="taskToFrontExitAnimation">@anim/task_open_exit</item>
-        <item name="taskToBackEnterAnimation">@anim/task_close_enter</item>
-        <item name="taskToBackExitAnimation">@anim/task_close_exit</item>
-        <item name="wallpaperOpenEnterAnimation">@anim/wallpaper_open_enter</item>
-        <item name="wallpaperOpenExitAnimation">@anim/wallpaper_open_exit</item>
-        <item name="wallpaperCloseEnterAnimation">@anim/wallpaper_close_enter</item>
-        <item name="wallpaperCloseExitAnimation">@anim/wallpaper_close_exit</item>
-        <item name="wallpaperIntraOpenEnterAnimation">@anim/wallpaper_intra_open_enter</item>
-        <item name="wallpaperIntraOpenExitAnimation">@anim/wallpaper_intra_open_exit</item>
-        <item name="wallpaperIntraCloseEnterAnimation">@anim/wallpaper_intra_close_enter</item>
-        <item name="wallpaperIntraCloseExitAnimation">@anim/wallpaper_intra_close_exit</item>
-    </style>
-
-    <!-- Standard animations for a non-full-screen window or activity. -->
-    <style name="Animation.Dialog">
-        <item name="windowEnterAnimation">@anim/dialog_enter</item>
-        <item name="windowExitAnimation">@anim/dialog_exit</item>
-    </style>
-
-    <!-- Standard animations for hiding and showing the status bar. -->
-    <style name="Animation.StatusBar">
-        <item name="windowEnterAnimation">@anim/status_bar_enter</item>
-        <item name="windowExitAnimation">@anim/status_bar_exit</item>
-    </style>
-
-    <!-- Standard animations for a translucent window or activity.  This
-         style is <em>not<em> used by default for the translucent theme
-         (since translucent activities are a special case that have no
-         clear UI paradigm), but you can make your own specialized theme
-         with this animation style if you would like to have the standard
-         platform transition animation. -->
-    <style name="Animation.Translucent">
-        <item name="windowEnterAnimation">@anim/translucent_enter</item>
-        <item name="windowExitAnimation">@anim/translucent_exit</item>
-    </style>
-
-    <!-- Standard animations for a non-full-screen window or activity. -->
-    <style name="Animation.LockScreen">
-        <item name="windowEnterAnimation">@anim/lock_screen_enter</item>
-        <item name="windowExitAnimation">@anim/lock_screen_exit</item>
-    </style>
-
-    <style name="Animation.OptionsPanel">
-        <item name="windowEnterAnimation">@anim/options_panel_enter</item>
-        <item name="windowExitAnimation">@anim/options_panel_exit</item>
-    </style>
-
-    <style name="Animation.SubMenuPanel">
-        <item name="windowEnterAnimation">@anim/submenu_enter</item>
-        <item name="windowExitAnimation">@anim/submenu_exit</item>
-    </style>
-
-    <style name="Animation.TypingFilter">
-        <item name="windowEnterAnimation">@anim/grow_fade_in_center</item>
-        <item name="windowExitAnimation">@anim/shrink_fade_out_center</item>
-    </style>
-
-    <style name="Animation.TypingFilterRestore">
-        <item name="windowEnterAnimation">@null</item>
-        <item name="windowExitAnimation">@anim/shrink_fade_out_center</item>
-    </style>
-
-    <style name="Animation.Toast">
-        <item name="windowEnterAnimation">@anim/toast_enter</item>
-        <item name="windowExitAnimation">@anim/toast_exit</item>
-    </style>
-
-    <style name="Animation.DropDownDown">
-        <item name="windowEnterAnimation">@anim/grow_fade_in</item>
-        <item name="windowExitAnimation">@anim/shrink_fade_out</item>
-    </style>
-
-    <style name="Animation.DropDownUp">
-        <item name="windowEnterAnimation">@anim/grow_fade_in_from_bottom</item>
-        <item name="windowExitAnimation">@anim/shrink_fade_out_from_bottom</item>
-    </style>
-
-    <!-- {@hide} -->
-    <style name="Animation.SlidingCard">
-        <item name="windowEnterAnimation">@anim/slide_in_up</item>
-        <item name="windowExitAnimation">@anim/slide_out_down</item>
-    </style>
-
-    <!-- Window animations that are applied to input method overlay windows. -->
-    <style name="Animation.InputMethod">
-        <item name="windowEnterAnimation">@anim/input_method_enter</item>
-        <item name="windowExitAnimation">@anim/input_method_exit</item>
-    </style>
-
-    <!-- Special optional fancy IM animations. @hide -->
-    <style name="Animation.InputMethodFancy">
-        <item name="windowEnterAnimation">@anim/input_method_fancy_enter</item>
-        <item name="windowExitAnimation">@anim/input_method_fancy_exit</item>
-    </style>
-
-    <!-- Window animations that are applied to the search bar overlay window.
-        Previously used, but currently unused.
-         {@hide Pending API council approval} -->
-    <style name="Animation.SearchBar">
-        <item name="windowEnterAnimation">@anim/search_bar_enter</item>
-        <item name="windowExitAnimation">@anim/search_bar_exit</item>
-    </style>
-
-    <!-- Window animations that are applied to the zoom buttons overlay window. -->
-    <style name="Animation.ZoomButtons">
-        <item name="windowEnterAnimation">@anim/fade_in</item>
-        <item name="windowExitAnimation">@anim/fade_out</item>
-    </style>
-
-    <!-- Standard animations for wallpapers. -->
-    <style name="Animation.Wallpaper">
-        <item name="windowEnterAnimation">@anim/wallpaper_enter</item>
-        <item name="windowExitAnimation">@anim/wallpaper_exit</item>
-    </style>
-
-    <!-- A special animation we can use for recent applications,
-         for devices that can support it (do alpha transformations). -->
-    <style name="Animation.RecentApplications">
-        <item name="windowEnterAnimation">@anim/fade_in</item>
-        <item name="windowExitAnimation">@anim/fade_out</item>
-    </style>
-
-    <!-- A special animation value used internally for popup windows. -->
-    <style name="Animation.PopupWindow" />
-
-    <!-- Status Bar Styles -->
-
-    <style name="TextAppearance.StatusBar">
-        <item name="android:textSize">16sp</item>
-        <item name="android:textStyle">normal</item>
-        <item name="android:textColor">?android:attr/textColorPrimary</item>
-    </style>
-    <style name="TextAppearance.StatusBar.Ticker">
-    </style>
-    <style name="TextAppearance.StatusBar.Title">
-        <item name="android:textSize">14sp</item>
-        <item name="android:textStyle">bold</item>
-    </style>
-
-    <style name="TextAppearance.StatusBar.Icon">
-        <item name="android:textStyle">bold</item>
-    </style>
-    <style name="TextAppearance.StatusBar.EventContent">
-        <item name="android:textSize">14sp</item>
-        <item name="android:textColor">#ff6b6b6b</item>
-    </style>
-    <style name="TextAppearance.StatusBar.EventContent.Title">
-        <item name="android:textSize">16sp</item>
-        <item name="android:textStyle">bold</item>
-        <item name="android:textColor">?android:attr/textColorPrimaryInverse</item>
-    </style>
-
-    <!-- Widget Styles -->
-
-    <style name="Widget">
-        <item name="android:textAppearance">?textAppearance</item>
-    </style>
-
-    <style name="Widget.AbsListView">
-        <item name="android:scrollbars">vertical</item>
-        <item name="android:fadingEdge">vertical</item>
-    </style>
-
-    <style name="Widget.GestureOverlayView">
-        <item name="android:gestureStrokeWidth">12.0</item>
-        <item name="android:gestureColor">#ffffff00</item>
-        <item name="android:uncertainGestureColor">#48ffff00</item>
-        <item name="android:fadeOffset">420</item>
-        <item name="android:fadeDuration">150</item>
-        <item name="android:gestureStrokeLengthThreshold">50.0</item>
-        <item name="android:gestureStrokeSquarenessThreshold">0.275</item>
-        <item name="android:gestureStrokeAngleThreshold">40.0</item>
-        <item name="android:eventsInterceptionEnabled">true</item>
-    </style>
-
-    <style name="Widget.GestureOverlayView.White">
-        <item name="android:gestureColor">#ff00ff00</item>
-        <item name="android:uncertainGestureColor">#4800ff00</item>
-    </style>
-
-    <style name="Widget.Button">
-        <item name="android:background">@android:drawable/btn_default</item>
-        <item name="android:focusable">true</item>
-        <item name="android:clickable">true</item>
-        <item name="android:textAppearance">?android:attr/textAppearanceSmallInverse</item>
-        <item name="android:textColor">@android:color/primary_text_light</item>
-        <item name="android:gravity">center_vertical|center_horizontal</item>
-    </style>
-
-    <style name="Widget.Button.Small">
-        <item name="android:background">@android:drawable/btn_default_small</item>
-    </style>
-
-    <style name="Widget.Button.Inset">
-        <item name="android:background">@android:drawable/button_inset</item>
-    </style>
-
-    <style name="Widget.Button.Transparent">
-        <item name="android:background">@android:drawable/btn_default_transparent</item>
-        <item name="android:textAppearance">?android:attr/textAppearanceSmall</item>
-        <item name="android:textColor">@android:color/white</item>
-    </style>
-
-    <style name="Widget.CompoundButton">
-        <item name="android:focusable">true</item>
-        <item name="android:clickable">true</item>
-        <item name="android:textAppearance">?android:attr/textAppearance</item>
-        <item name="android:textColor">?android:attr/textColorPrimaryDisableOnly</item>
-        <item name="android:gravity">center_vertical|left</item>
-    </style>
-
-    <style name="Widget.CompoundButton.CheckBox">
-        <item name="android:background">@android:drawable/btn_check_label_background</item>
-        <item name="android:button">@android:drawable/btn_check</item>
-    </style>
-
-    <style name="Widget.CompoundButton.RadioButton">
-        <item name="android:background">@android:drawable/btn_radio_label_background</item>
-        <item name="android:button">@android:drawable/btn_radio</item>
-    </style>
-
-    <style name="Widget.CompoundButton.Star">
-        <item name="android:background">@android:drawable/btn_star_label_background</item>
-        <item name="android:button">@android:drawable/btn_star</item>
-    </style>
-
-    <style name="Widget.Button.Toggle">
-        <item name="android:background">@android:drawable/btn_toggle_bg</item>
-        <item name="android:textOn">@android:string/capital_on</item>
-        <item name="android:textOff">@android:string/capital_off</item>
-        <item name="android:disabledAlpha">?android:attr/disabledAlpha</item>
-    </style>
-
-    <style name="Widget.ProgressBar">
-        <item name="android:indeterminateOnly">true</item>
-        <item name="android:indeterminateDrawable">@android:drawable/progress_medium_white</item>
-        <item name="android:indeterminateBehavior">repeat</item>
-        <item name="android:indeterminateDuration">3500</item>
-        <item name="android:minWidth">48dip</item>
-        <item name="android:maxWidth">48dip</item>
-        <item name="android:minHeight">48dip</item>
-        <item name="android:maxHeight">48dip</item>
-    </style>
-
-    <style name="Widget.ProgressBar.Large">
-        <item name="android:indeterminateDrawable">@android:drawable/progress_large_white</item>
-        <item name="android:minWidth">76dip</item>
-        <item name="android:maxWidth">76dip</item>
-        <item name="android:minHeight">76dip</item>
-        <item name="android:maxHeight">76dip</item>
-    </style>
-
-    <style name="Widget.ProgressBar.Small">
-        <item name="android:indeterminateDrawable">@android:drawable/progress_small_white</item>
-        <item name="android:minWidth">16dip</item>
-        <item name="android:maxWidth">16dip</item>
-        <item name="android:minHeight">16dip</item>
-        <item name="android:maxHeight">16dip</item>
-    </style>
-
-    <style name="Widget.ProgressBar.Inverse">
-        <item name="android:indeterminateDrawable">@android:drawable/progress_medium</item>
-    </style>
-
-    <style name="Widget.ProgressBar.Large.Inverse">
-        <item name="android:indeterminateDrawable">@android:drawable/progress_large</item>
-    </style>
-
-    <style name="Widget.ProgressBar.Small.Inverse">
-        <item name="android:indeterminateDrawable">@android:drawable/progress_small</item>
-    </style>
-
-    <style name="Widget.ProgressBar.Small.Title">
-        <item name="android:indeterminateDrawable">@android:drawable/progress_small_titlebar</item>
-    </style>
-
-    <style name="Widget.ProgressBar.Horizontal">
-        <item name="android:indeterminateOnly">false</item>
-        <item name="android:progressDrawable">@android:drawable/progress_horizontal</item>
-        <item name="android:indeterminateDrawable">@android:drawable/progress_indeterminate_horizontal</item>
-        <item name="android:minHeight">20dip</item>
-        <item name="android:maxHeight">20dip</item>
-    </style>
-
-    <style name="Widget.SeekBar">
-        <item name="android:indeterminateOnly">false</item>
-        <item name="android:progressDrawable">@android:drawable/progress_horizontal</item>
-        <item name="android:indeterminateDrawable">@android:drawable/progress_horizontal</item>
-        <item name="android:minHeight">20dip</item>
-        <item name="android:maxHeight">20dip</item>
-        <item name="android:thumb">@android:drawable/seek_thumb</item>
-        <item name="android:thumbOffset">8dip</item>
-        <item name="android:focusable">true</item>
-    </style>
-
-    <style name="Widget.RatingBar">
-        <item name="android:indeterminateOnly">false</item>
-        <item name="android:progressDrawable">@android:drawable/ratingbar_full</item>
-        <item name="android:indeterminateDrawable">@android:drawable/ratingbar_full</item>
-        <item name="android:minHeight">57dip</item>
-        <item name="android:maxHeight">57dip</item>
-        <item name="android:thumb">@null</item>
-    </style>
-
-    <style name="Widget.RatingBar.Indicator">
-        <item name="android:indeterminateOnly">false</item>
-        <item name="android:progressDrawable">@android:drawable/ratingbar</item>
-        <item name="android:indeterminateDrawable">@android:drawable/ratingbar</item>
-        <item name="android:minHeight">38dip</item>
-        <item name="android:maxHeight">38dip</item>
-        <item name="android:thumb">@null</item>
-        <item name="android:isIndicator">true</item>
-    </style>
-
-    <style name="Widget.RatingBar.Small">
-        <item name="android:indeterminateOnly">false</item>
-        <item name="android:progressDrawable">@android:drawable/ratingbar_small</item>
-        <item name="android:indeterminateDrawable">@android:drawable/ratingbar_small</item>
-        <item name="android:minHeight">14dip</item>
-        <item name="android:maxHeight">14dip</item>
-        <item name="android:thumb">@null</item>
-        <item name="android:isIndicator">true</item>
-    </style>
-
-    <style name="Widget.TextView">
-        <item name="android:textAppearance">?android:attr/textAppearanceSmall</item>
-        <item name="android:textSelectHandleLeft">?android:attr/textSelectHandleLeft</item>
-        <item name="android:textSelectHandleRight">?android:attr/textSelectHandleRight</item>
-        <item name="android:textSelectHandle">?android:attr/textSelectHandle</item>
-    </style>
-
-    <style name="Widget.TextView.ListSeparator">
-        <item name="android:background">@android:drawable/dark_header_dither</item>
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">25dip</item>
-        <item name="android:textStyle">bold</item>
-        <item name="android:textColor">?textColorSecondary</item>
-        <item name="android:textSize">14sp</item>
-        <item name="android:gravity">center_vertical</item>
-        <item name="android:paddingLeft">5sp</item>
-    </style>
-
-    <style name="Widget.TextView.ListSeparator.White">
-        <item name="android:textColor">?textColorPrimaryInverse</item>
-        <item name="android:background">@android:drawable/light_header_dither</item>
-    </style>
-
-    <style name="Widget.EditText">
-        <item name="android:focusable">true</item>
-        <item name="android:focusableInTouchMode">true</item>
-        <item name="android:clickable">true</item>
-        <item name="android:background">@android:drawable/edit_text</item>
-        <item name="android:textAppearance">?android:attr/textAppearanceMediumInverse</item>
-        <item name="android:textColor">@android:color/primary_text_light</item>
-        <item name="android:gravity">center_vertical</item>
-    </style>
-
-    <style name="Widget.ExpandableListView" parent="Widget.ListView">
-        <item name="android:groupIndicator">@android:drawable/expander_group</item>
-        <item name="android:indicatorLeft">?android:attr/expandableListPreferredItemIndicatorLeft</item>
-        <item name="android:indicatorRight">?android:attr/expandableListPreferredItemIndicatorRight</item>
-        <item name="android:childDivider">@android:drawable/divider_horizontal_dark_opaque</item>
-    </style>
-
-    <style name="Widget.ExpandableListView.White">
-        <item name="android:childDivider">@android:drawable/divider_horizontal_bright_opaque</item>
-    </style>
-
-    <style name="Widget.ImageWell">
-        <item name="android:background">@android:drawable/panel_picture_frame_background</item>
-    </style>
-
-    <style name="Widget.ImageButton">
-        <item name="android:focusable">true</item>
-        <item name="android:clickable">true</item>
-        <item name="android:scaleType">center</item>
-        <item name="android:background">@android:drawable/btn_default</item>
-    </style>
-
-    <style name="Widget.AutoCompleteTextView">
-        <item name="android:focusable">true</item>
-        <item name="android:focusableInTouchMode">true</item>
-        <item name="android:clickable">true</item>
-        <item name="android:background">@android:drawable/edit_text</item>
-        <item name="android:completionHintView">@android:layout/simple_dropdown_hint</item>
-        <item name="android:textAppearance">?android:attr/textAppearanceMediumInverse</item>
-        <item name="android:gravity">center_vertical</item>
-        <item name="android:completionThreshold">2</item>
-        <item name="android:dropDownSelector">@android:drawable/list_selector_background</item>
-        <item name="android:popupBackground">@android:drawable/spinner_dropdown_background</item>
-        <item name="android:dropDownVerticalOffset">-6dip</item>
-        <item name="android:dropDownHorizontalOffset">0dip</item>
-        <item name="android:dropDownWidth">wrap_content</item>
-    </style>
-
-    <style name="Widget.Spinner">
-        <item name="android:background">@android:drawable/btn_dropdown</item>
-        <item name="android:clickable">true</item>
-    </style>
-
-    <style name="Widget.TextView.PopupMenu">
-        <item name="android:clickable">true</item>
-        <item name="android:textAppearance">@style/TextAppearance.Widget.TextView.PopupMenu</item>
-    </style>
-
-    <style name="Widget.TextView.SpinnerItem">
-        <item name="android:textAppearance">@style/TextAppearance.Widget.TextView.SpinnerItem</item>
-    </style>
-
-    <style name="Widget.DropDownItem">
-        <item name="android:textAppearance">@style/TextAppearance.Widget.DropDownItem</item>
-        <item name="android:paddingLeft">6dip</item>
-        <item name="android:paddingRight">6dip</item>
-        <item name="android:gravity">center_vertical</item>
-    </style>
-
-    <style name="Widget.DropDownItem.Spinner">
-        <item name="android:checkMark">@android:drawable/btn_radio</item>
-    </style>
-
-    <style name="Widget.ScrollView">
-        <item name="android:scrollbars">vertical</item>
-        <item name="android:fadingEdge">vertical</item>
-    </style>
-
-    <style name="Widget.HorizontalScrollView">
-        <item name="android:scrollbars">horizontal</item>
-        <item name="android:fadingEdge">horizontal</item>
-    </style>
-
-    <style name="Widget.ListView" parent="Widget.AbsListView">
-        <item name="android:listSelector">@android:drawable/list_selector_background</item>
-        <item name="android:cacheColorHint">?android:attr/colorBackgroundCacheHint</item>
-        <item name="android:divider">@android:drawable/divider_horizontal_dark_opaque</item>
-    </style>
-
-    <style name="Widget.ListView.White" parent="Widget.AbsListView">
-        <item name="android:listSelector">@android:drawable/list_selector_background</item>
-        <item name="android:cacheColorHint">?android:attr/colorBackgroundCacheHint</item>
-        <item name="android:divider">@android:drawable/divider_horizontal_bright_opaque</item>
-    </style>
-
-    <style name="Widget.ListView.DropDown">
-        <item name="android:cacheColorHint">@null</item>
-        <item name="android:divider">@android:drawable/divider_horizontal_bright_opaque</item>
-    </style>
-
-    <style name="Widget.ListView.Menu">
-                <item name="android:cacheColorHint">@null</item>
-        <item name="android:scrollbars">vertical</item>
-        <item name="android:fadingEdge">vertical</item>
-        <item name="listSelector">@android:drawable/menu_selector</item>
-        <!-- Light background for the list in menus, so the divider for bright themes -->
-        <item name="android:divider">@android:drawable/divider_horizontal_dark</item>
-    </style>
-
-    <style name="Widget.GridView" parent="Widget.AbsListView">
-        <item name="android:listSelector">@android:drawable/grid_selector_background</item>
-    </style>
-
-    <style name="Widget.WebView">
-        <item name="android:focusable">true</item>
-        <item name="android:scrollbars">horizontal|vertical</item>
-    </style>
-
-    <style name="Widget.WebTextView">
-        <item name="android:focusable">true</item>
-        <item name="android:focusableInTouchMode">true</item>
-        <item name="android:clickable">true</item>
-        <item name="android:completionHintView">@android:layout/simple_dropdown_item_1line</item>
-        <item name="android:textAppearance">?android:attr/textAppearanceLargeInverse</item>
-        <item name="android:completionThreshold">2</item>
-        <item name="android:dropDownSelector">@android:drawable/list_selector_background</item>
-        <item name="android:popupBackground">@android:drawable/spinner_dropdown_background</item>
-    </style>
-
-    <style name="Widget.TabWidget">
-        <item name="android:textAppearance">@style/TextAppearance.Widget.TabWidget</item>
-        <item name="ellipsize">marquee</item>
-        <item name="singleLine">true</item>
-    </style>
-
-    <style name="Widget.Gallery">
-        <item name="android:fadingEdge">horizontal</item>
-        <item name="android:gravity">center_vertical</item>
-        <item name="android:spacing">-20dip</item>
-        <item name="android:unselectedAlpha">0.85</item>
-    </style>
-
-    <style name="Widget.PopupWindow">
-        <item name="android:popupBackground">@android:drawable/editbox_dropdown_background_dark</item>
-        <item name="android:popupAnimationStyle">@android:style/Animation.PopupWindow</item>
-    </style>
-
-    <style name="Widget.KeyboardView" parent="android:Widget">
-        <item name="android:background">@android:drawable/keyboard_background</item>
-        <item name="android:keyBackground">@android:drawable/btn_keyboard_key</item>
-        <item name="android:keyTextSize">22sp</item>
-        <item name="android:keyTextColor">#FFFFFFFF</item>
-        <item name="android:keyPreviewLayout">@android:layout/keyboard_key_preview</item>
-        <item name="android:keyPreviewOffset">-12dip</item>
-        <item name="android:keyPreviewHeight">80dip</item>
-        <item name="android:labelTextSize">14sp</item>
-        <item name="android:popupLayout">@android:layout/keyboard_popup_keyboard</item>
-        <item name="android:verticalCorrection">-10dip</item>
-        <item name="android:shadowColor">#BB000000</item>
-        <item name="android:shadowRadius">2.75</item>
-    </style>
-
-    <style name="Widget.QuickContactBadge">
-        <item name="android:layout_width">47.33333dip</item>
-        <item name="android:layout_height">56dip</item>
-        <item name="android:background">@android:drawable/quickcontact_badge</item>
-        <item name="android:clickable">true</item>
-        <item name="android:scaleType">fitCenter</item>
-    </style>
-
-    <style name="Widget.QuickContactBadgeSmall">
-        <item name="android:layout_width">39dip</item>
-        <item name="android:layout_height">42dip</item>
-        <item name="android:background">@android:drawable/quickcontact_badge_small</item>
-        <item name="android:clickable">true</item>
-        <item name="android:scaleType">fitCenter</item>
-    </style>
-
-    <style name="Widget.QuickContactBadge.WindowSmall">
-        <item name="android:quickContactWindowSize">modeSmall</item>
-    </style>
-
-    <style name="Widget.QuickContactBadge.WindowMedium">
-        <item name="android:quickContactWindowSize">modeMedium</item>
-    </style>
-
-    <style name="Widget.QuickContactBadge.WindowLarge">
-        <item name="android:quickContactWindowSize">modeLarge</item>
-    </style>
-
-    <style name="Widget.QuickContactBadgeSmall.WindowSmall">
-        <item name="android:quickContactWindowSize">modeSmall</item>
-    </style>
-
-    <style name="Widget.QuickContactBadgeSmall.WindowMedium">
-        <item name="android:quickContactWindowSize">modeMedium</item>
-    </style>
-
-    <style name="Widget.QuickContactBadgeSmall.WindowLarge">
-        <item name="android:quickContactWindowSize">modeLarge</item>
-    </style>
-
-    <!-- Text Appearances -->
-    <eat-comment />
-
-    <style name="TextAppearance">
-        <item name="android:textColor">?textColorPrimary</item>
-        <item name="android:textColorHighlight">#FFFF9200</item>
-        <item name="android:textColorHint">?textColorHint</item>
-        <item name="android:textColorLink">#5C5CFF</item>
-        <item name="android:textSize">16sp</item>
-        <item name="android:textStyle">normal</item>
-    </style>
-
-    <style name="TextAppearance.Inverse">
-        <item name="textColor">?textColorPrimaryInverse</item>
-        <item name="android:textColorHint">?textColorHintInverse</item>
-        <item name="android:textColorLink">#0000EE</item>
-    </style>
-
-    <style name="TextAppearance.Theme">
-    </style>
-
-    <style name="TextAppearance.DialogWindowTitle">
-        <item name="android:textSize">18sp</item>
-        <item name="android:textStyle">normal</item>
-        <item name="android:textColor">?textColorPrimary</item>
-    </style>
-
-    <style name="TextAppearance.Large">
-        <item name="android:textSize">21sp</item>
-        <item name="android:textStyle">normal</item>
-        <item name="android:textColor">?textColorPrimary</item>
-    </style>
-
-    <style name="TextAppearance.Large.Inverse">
-        <item name="android:textColor">?textColorPrimaryInverse</item>
-        <item name="android:textColorHint">?textColorHintInverse</item>
-    </style>
-
-    <style name="TextAppearance.Medium">
-        <item name="android:textSize">17sp</item>
-        <item name="android:textStyle">normal</item>
-        <item name="android:textColor">?textColorPrimary</item>
-    </style>
-
-    <style name="TextAppearance.Medium.Inverse">
-        <item name="android:textColor">?textColorPrimaryInverse</item>
-        <item name="android:textColorHint">?textColorHintInverse</item>
-    </style>
-
-    <style name="TextAppearance.Small">
-        <item name="android:textSize">14sp</item>
-        <item name="android:textStyle">normal</item>
-        <item name="android:textColor">?textColorSecondary</item>
-    </style>
-
-    <style name="TextAppearance.Small.Inverse">
-        <item name="android:textColor">?textColorSecondaryInverse</item>
-        <item name="android:textColorHint">?textColorHintInverse</item>
-    </style>
-
-    <style name="TextAppearance.Theme.Dialog" parent="TextAppearance.Theme">
-    </style>
-
-    <style name="TextAppearance.Theme.Dialog.AppError">
-        <item name="android:textColor">#ffffc0c0</item>
-    </style>
-
-    <style name="TextAppearance.Widget">
-    </style>
-
-    <style name="TextAppearance.Widget.Button" parent="TextAppearance.Small.Inverse">
-        <item name="android:textColor">@android:color/primary_text_light_nodisable</item>
-    </style>
-
-    <style name="TextAppearance.Widget.IconMenu.Item" parent="TextAppearance.Small">
-        <item name="android:textColor">?textColorPrimary</item>
-    </style>
-
-    <style name="TextAppearance.Widget.EditText">
-        <item name="android:textColor">@color/widget_edittext_dark</item>
-        <item name="android:textColorHint">@android:color/hint_foreground_light</item>
-    </style>
-
-    <style name="TextAppearance.Widget.TabWidget">
-        <item name="android:textSize">14sp</item>
-        <item name="android:textStyle">normal</item>
-        <item name="android:textColor">@android:color/tab_indicator_text</item>
-    </style>
-
-    <style name="TextAppearance.Widget.TextView">
-        <item name="android:textColor">?textColorPrimaryDisableOnly</item>
-        <item name="android:textColorHint">?textColorHint</item>
-    </style>
-
-    <style name="TextAppearance.Widget.TextView.PopupMenu">
-        <item name="android:textSize">18sp</item>
-        <item name="android:textColor">?textColorPrimaryDisableOnly</item>
-        <item name="android:textColorHint">?textColorHint</item>
-    </style>
-
-    <style name="TextAppearance.Widget.DropDownHint">
-        <item name="android:textColor">?textColorPrimaryInverse</item>
-        <item name="android:textSize">14sp</item>
-    </style>
-
-    <style name="TextAppearance.Widget.DropDownItem">
-        <item name="android:textColor">@android:color/primary_text_light_disable_only</item>
-    </style>
-
-    <style name="TextAppearance.Widget.TextView.SpinnerItem">
-        <item name="android:textColor">@android:color/primary_text_light_disable_only</item>
-    </style>
-
-    <!-- @hide -->
-    <style name="TextAppearance.SlidingTabNormal"
-        parent="@android:attr/textAppearanceMedium">
-        <item name="android:textColor">?android:attr/textColorTertiary</item>
-        <item name="android:textSize">28sp</item>
-        <item name="android:shadowColor">@android:color/sliding_tab_text_color_shadow</item>
-        <item name="android:shadowDx">0.0</item>
-        <item name="android:shadowDy">1.0</item>
-        <item name="android:shadowRadius">5.0</item>
-    </style>
-
-    <!-- @hide -->
-    <style name="TextAppearance.SlidingTabActive"
-        parent="@android:attr/textAppearanceMedium">
-        <item name="android:textColor">@android:color/sliding_tab_text_color_active</item>
-        <item name="android:textSize">28sp</item>
-    </style>
-
-
-    <!-- @hide -->
-     <style name="TextAppearance.SearchResult">
-         <item name="android:textStyle">normal</item>
-         <item name="android:textColor">?textColorPrimaryInverse</item>
-         <item name="android:textColorHint">?textColorHintInverse</item>
-     </style>
-
-     <!-- @hide -->
-     <style name="TextAppearance.SearchResult.Title">
-         <item name="android:textSize">16sp</item>
-     </style>
-
-     <!-- @hide -->
-     <style name="TextAppearance.SearchResult.Subtitle">
-         <item name="android:textSize">13sp</item>
-         <item name="android:textColor">?textColorSecondaryInverse</item>
-     </style>
-
-    <style name="TextAppearance.WindowTitle">
-        <item name="android:textColor">#fff</item>
-        <item name="android:textSize">14sp</item>
-        <item name="android:textStyle">bold</item>
-    </style>
-
-    <!-- Preference Styles -->
-
-    <style name="Preference">
-        <item name="android:layout">@android:layout/preference</item>
-    </style>
-
-    <style name="Preference.Information">
-        <item name="android:layout">@android:layout/preference_information</item>
-        <item name="android:enabled">false</item>
-        <item name="android:shouldDisableView">false</item>
-    </style>
-
-    <style name="Preference.Category">
-        <item name="android:layout">@android:layout/preference_category</item>
-        <!-- The title should not dim if the category is disabled, instead only the preference children should dim. -->
-        <item name="android:shouldDisableView">false</item>
-        <item name="android:selectable">false</item>
-    </style>
-
-    <style name="Preference.CheckBoxPreference">
-        <item name="android:widgetLayout">@android:layout/preference_widget_checkbox</item>
-    </style>
-
-    <style name="Preference.PreferenceScreen">
-    </style>
-
-    <style name="Preference.DialogPreference">
-        <item name="android:positiveButtonText">@android:string/ok</item>
-        <item name="android:negativeButtonText">@android:string/cancel</item>
-        <item name="android:widgetLayout">@android:layout/preference_dialog</item>
-    </style>
-
-    <style name="Preference.DialogPreference.YesNoPreference">
-        <item name="android:positiveButtonText">@android:string/yes</item>
-        <item name="android:negativeButtonText">@android:string/no</item>
-    </style>
-
-    <style name="Preference.DialogPreference.EditTextPreference">
-        <item name="android:dialogLayout">@android:layout/preference_dialog_edittext</item>
-    </style>
-
-    <style name="Preference.RingtonePreference">
-        <item name="android:ringtoneType">ringtone</item>
-        <item name="android:showSilent">true</item>
-        <item name="android:showDefault">true</item>
-        <item name="android:widgetLayout">@android:layout/preference_dialog</item>
-    </style>
-
-    <!-- Other Misc Styles -->
-    <eat-comment />
-
-    <style name="MediaButton">
-        <item name="android:background">@android:drawable/media_button_background</item>
-        <item name="android:layout_width">71dip</item>
-        <item name="android:layout_height">52dip</item>
-    </style>
-
-    <style name="MediaButton.Previous">
-        <item name="android:src">@android:drawable/ic_media_previous</item>
-    </style>
-
-    <style name="MediaButton.Next">
-        <item name="android:src">@android:drawable/ic_media_next</item>
-    </style>
-
-    <style name="MediaButton.Play">
-        <item name="android:src">@android:drawable/ic_media_play</item>
-    </style>
-
-    <style name="MediaButton.Ffwd">
-        <item name="android:src">@android:drawable/ic_media_ff</item>
-    </style>
-
-    <style name="MediaButton.Rew">
-        <item name="android:src">@android:drawable/ic_media_rew</item>
-    </style>
-
-    <style name="MediaButton.Pause">
-        <item name="android:src">@android:drawable/ic_media_pause</item>
-    </style>
-
-    <style name="ZoomControls">
-        <item name="android:gravity">bottom</item>
-        <item name="android:paddingLeft">15dip</item>
-        <item name="android:paddingRight">15dip</item>
-    </style>
-
-    <!-- Style you can use with a container (typically a horizontal
-         LinearLayout) to get the standard "button bar" background and
-         spacing. @hide -->
-    <style name="ButtonBar">
-        <item name="android:paddingTop">5dip</item>
-        <item name="android:paddingLeft">4dip</item>
-        <item name="android:paddingRight">4dip</item>
-        <item name="android:paddingBottom">1dip</item>
-        <item name="android:background">@android:drawable/bottom_bar</item>
-    </style>
-
-    <!-- Style for the small popup windows that contain text selection anchors. -->
-    <style name="Widget.TextSelectHandle">
-        <item name="android:popupAnimationStyle">@android:style/Animation.TextSelectHandle</item>
-    </style>
-
-    <!-- Style for animating text selection handles. -->
-    <style name="Animation.TextSelectHandle">
-        <item name="windowEnterAnimation">@android:anim/fade_in</item>
-        <item name="windowExitAnimation">@android:anim/fade_out</item>
-    </style>
-</resources>
diff --git a/overlay/ldpi/frameworks/base/core/res/res/values/themes.xml b/overlay/ldpi/frameworks/base/core/res/res/values/themes.xml
deleted file mode 100644
index 9348e4e..0000000
--- a/overlay/ldpi/frameworks/base/core/res/res/values/themes.xml
+++ /dev/null
@@ -1,539 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2006 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <!-- The default system theme. This is the theme used for activities
-         that have not explicitly set their own theme.
-
-         <p>You can count on this being a dark
-         background with light text on top, but should try to make no
-         other assumptions about its appearance. In particular, the text
-         inside of widgets using this theme may be completely different,
-         with the widget container being a light color and the text on top
-         of it a dark color.
-    -->
-    <style name="Theme">
-
-        <item name="colorForeground">@android:color/bright_foreground_dark</item>
-        <item name="colorForegroundInverse">@android:color/bright_foreground_dark_inverse</item>
-        <item name="colorBackground">@android:color/background_dark</item>
-        <item name="colorBackgroundCacheHint">?android:attr/colorBackground</item>
-        <item name="disabledAlpha">0.5</item>
-        <item name="backgroundDimAmount">0.6</item>
-
-        <!-- Text styles -->
-        <item name="textAppearance">@android:style/TextAppearance</item>
-        <item name="textAppearanceInverse">@android:style/TextAppearance.Inverse</item>
-
-        <item name="textColorPrimary">@android:color/primary_text_dark</item>
-        <item name="textColorSecondary">@android:color/secondary_text_dark</item>
-        <item name="textColorTertiary">@android:color/tertiary_text_dark</item>
-        <item name="textColorPrimaryInverse">@android:color/primary_text_light</item>
-        <item name="textColorSecondaryInverse">@android:color/secondary_text_light</item>
-        <item name="textColorTertiaryInverse">@android:color/tertiary_text_light</item>
-        <item name="textColorPrimaryDisableOnly">@android:color/primary_text_dark_disable_only</item>
-        <item name="textColorPrimaryInverseDisableOnly">@android:color/primary_text_light_disable_only</item>
-        <item name="textColorPrimaryNoDisable">@android:color/primary_text_dark_nodisable</item>
-        <item name="textColorSecondaryNoDisable">@android:color/secondary_text_dark_nodisable</item>
-        <item name="textColorPrimaryInverseNoDisable">@android:color/primary_text_light_nodisable</item>
-        <item name="textColorSecondaryInverseNoDisable">@android:color/secondary_text_light_nodisable</item>
-        <item name="textColorHint">@android:color/hint_foreground_dark</item>
-        <item name="textColorHintInverse">@android:color/hint_foreground_light</item>
-        <item name="textColorSearchUrl">@android:color/search_url_text</item>
-
-        <item name="textAppearanceLarge">@android:style/TextAppearance.Large</item>
-        <item name="textAppearanceMedium">@android:style/TextAppearance.Medium</item>
-        <item name="textAppearanceSmall">@android:style/TextAppearance.Small</item>
-        <item name="textAppearanceLargeInverse">@android:style/TextAppearance.Large.Inverse</item>
-        <item name="textAppearanceMediumInverse">@android:style/TextAppearance.Medium.Inverse</item>
-        <item name="textAppearanceSmallInverse">@android:style/TextAppearance.Small.Inverse</item>
-        <item name="textAppearanceSearchResultTitle">@android:style/TextAppearance.SearchResult.Title</item>
-        <item name="textAppearanceSearchResultSubtitle">@android:style/TextAppearance.SearchResult.Subtitle</item>
-
-        <item name="textAppearanceButton">@android:style/TextAppearance.Widget.Button</item>
-
-        <item name="candidatesTextStyleSpans">@android:string/candidates_style</item>
-
-        <item name="textCheckMark">@android:drawable/indicator_check_mark_dark</item>
-        <item name="textCheckMarkInverse">@android:drawable/indicator_check_mark_light</item>
-
-        <!-- Button styles -->
-        <item name="buttonStyle">@android:style/Widget.Button</item>
-
-        <item name="buttonStyleSmall">@android:style/Widget.Button.Small</item>
-        <item name="buttonStyleInset">@android:style/Widget.Button.Inset</item>
-
-        <item name="buttonStyleToggle">@android:style/Widget.Button.Toggle</item>
-
-        <!-- List attributes -->
-        <item name="listPreferredItemHeight">58dip</item>
-        <!-- @hide -->
-        <item name="searchResultListItemHeight">58dip</item>
-        <item name="listDivider">@drawable/divider_horizontal_dark</item>
-        <item name="listSeparatorTextViewStyle">@android:style/Widget.TextView.ListSeparator</item>
-
-                <item name="listChoiceIndicatorSingle">@android:drawable/btn_radio</item>
-        <item name="listChoiceIndicatorMultiple">@android:drawable/btn_check</item>
-
-        <item name="expandableListPreferredItemPaddingLeft">40dip</item>
-        <item name="expandableListPreferredChildPaddingLeft">
-                ?android:attr/expandableListPreferredItemPaddingLeft</item>
-
-        <item name="expandableListPreferredItemIndicatorLeft">3dip</item>
-        <item name="expandableListPreferredItemIndicatorRight">33dip</item>
-        <item name="expandableListPreferredChildIndicatorLeft">
-                ?android:attr/expandableListPreferredItemIndicatorLeft</item>
-        <item name="expandableListPreferredChildIndicatorRight">
-                ?android:attr/expandableListPreferredItemIndicatorRight</item>
-
-        <!-- Gallery attributes -->
-        <item name="galleryItemBackground">@android:drawable/gallery_item_background</item>
-
-        <!-- Window attributes -->
-        <item name="windowBackground">@android:drawable/screen_background_dark</item>
-        <item name="windowFrame">@null</item>
-        <item name="windowNoTitle">false</item>
-        <item name="windowFullscreen">false</item>
-        <item name="windowIsFloating">false</item>
-        <item name="windowContentOverlay">@android:drawable/title_bar_shadow</item>
-        <item name="windowShowWallpaper">false</item>
-        <item name="windowTitleStyle">@android:style/WindowTitle</item>
-        <item name="windowTitleSize">25dip</item>
-        <item name="windowTitleBackgroundStyle">@android:style/WindowTitleBackground</item>
-        <item name="android:windowAnimationStyle">@android:style/Animation.Activity</item>
-        <item name="android:windowSoftInputMode">stateUnspecified|adjustUnspecified</item>
-
-        <!-- Dialog attributes -->
-        <item name="alertDialogStyle">@android:style/AlertDialog</item>
-
-        <!-- Panel attributes -->
-        <item name="panelBackground">@android:drawable/menu_background</item>
-        <item name="panelFullBackground">@android:drawable/menu_background_fill_parent_width</item>
-        <!-- These three attributes do not seems to be used by the framework. Declared public though -->
-        <item name="panelColorBackground">#000</item>
-        <item name="panelColorForeground">?android:attr/textColorPrimary</item>
-        <item name="panelTextAppearance">?android:attr/textAppearance</item>
-
-        <!-- Scrollbar attributes -->
-        <item name="scrollbarFadeDuration">250</item>
-        <item name="scrollbarDefaultDelayBeforeFade">300</item>
-        <item name="scrollbarSize">10dip</item>
-        <item name="scrollbarThumbHorizontal">@android:drawable/scrollbar_handle_horizontal</item>
-        <item name="scrollbarThumbVertical">@android:drawable/scrollbar_handle_vertical</item>
-        <item name="scrollbarTrackHorizontal">@null</item>
-        <item name="scrollbarTrackVertical">@null</item>
-
-        <!-- Text selection handle attributes -->
-        <item name="textSelectHandleLeft">@android:drawable/text_select_handle_left</item>
-        <item name="textSelectHandleRight">@android:drawable/text_select_handle_right</item>
-        <item name="textSelectHandle">@android:drawable/text_select_handle_middle</item>
-        <item name="textSelectHandleWindowStyle">@android:style/Widget.TextSelectHandle</item>
-
-        <!-- Widget styles -->
-        <item name="absListViewStyle">@android:style/Widget.AbsListView</item>
-        <item name="autoCompleteTextViewStyle">@android:style/Widget.AutoCompleteTextView</item>
-        <item name="checkboxStyle">@android:style/Widget.CompoundButton.CheckBox</item>
-        <item name="dropDownListViewStyle">@android:style/Widget.ListView.DropDown</item>
-        <item name="editTextStyle">@android:style/Widget.EditText</item>
-        <item name="expandableListViewStyle">@android:style/Widget.ExpandableListView</item>
-        <item name="expandableListViewWhiteStyle">@android:style/Widget.ExpandableListView.White</item>
-        <item name="galleryStyle">@android:style/Widget.Gallery</item>
-        <item name="gestureOverlayViewStyle">@android:style/Widget.GestureOverlayView</item>
-        <item name="gridViewStyle">@android:style/Widget.GridView</item>
-        <item name="imageButtonStyle">@android:style/Widget.ImageButton</item>
-        <item name="imageWellStyle">@android:style/Widget.ImageWell</item>
-        <item name="listViewStyle">@android:style/Widget.ListView</item>
-        <item name="listViewWhiteStyle">@android:style/Widget.ListView.White</item>
-        <item name="popupWindowStyle">@android:style/Widget.PopupWindow</item>
-        <item name="progressBarStyle">@android:style/Widget.ProgressBar</item>
-        <item name="progressBarStyleHorizontal">@android:style/Widget.ProgressBar.Horizontal</item>
-        <item name="progressBarStyleSmall">@android:style/Widget.ProgressBar.Small</item>
-        <item name="progressBarStyleSmallTitle">@android:style/Widget.ProgressBar.Small.Title</item>
-        <item name="progressBarStyleLarge">@android:style/Widget.ProgressBar.Large</item>
-        <item name="progressBarStyleInverse">@android:style/Widget.ProgressBar.Inverse</item>
-                <item name="progressBarStyleSmallInverse">@android:style/Widget.ProgressBar.Small.Inverse</item>
-            <item name="progressBarStyleLargeInverse">@android:style/Widget.ProgressBar.Large.Inverse</item>
-        <item name="seekBarStyle">@android:style/Widget.SeekBar</item>
-        <item name="ratingBarStyle">@android:style/Widget.RatingBar</item>
-        <item name="ratingBarStyleIndicator">@android:style/Widget.RatingBar.Indicator</item>
-        <item name="ratingBarStyleSmall">@android:style/Widget.RatingBar.Small</item>
-        <item name="radioButtonStyle">@android:style/Widget.CompoundButton.RadioButton</item>
-        <item name="scrollViewStyle">@android:style/Widget.ScrollView</item>
-        <item name="horizontalScrollViewStyle">@android:style/Widget.HorizontalScrollView</item>
-        <item name="spinnerStyle">@android:style/Widget.Spinner</item>
-        <item name="starStyle">@android:style/Widget.CompoundButton.Star</item>
-        <item name="tabWidgetStyle">@android:style/Widget.TabWidget</item>
-        <item name="textViewStyle">@android:style/Widget.TextView</item>
-        <item name="webTextViewStyle">@android:style/Widget.WebTextView</item>
-        <item name="webViewStyle">@android:style/Widget.WebView</item>
-        <item name="dropDownItemStyle">@android:style/Widget.DropDownItem</item>
-        <item name="spinnerDropDownItemStyle">@android:style/Widget.DropDownItem.Spinner</item>
-        <item name="spinnerItemStyle">@android:style/Widget.TextView.SpinnerItem</item>
-        <item name="dropDownHintAppearance">@android:style/TextAppearance.Widget.DropDownHint</item>
-        <item name="keyboardViewStyle">@android:style/Widget.KeyboardView</item>
-        <item name="quickContactBadgeStyleWindowSmall">@android:style/Widget.QuickContactBadge.WindowSmall</item>
-        <item name="quickContactBadgeStyleWindowMedium">@android:style/Widget.QuickContactBadge.WindowMedium</item>
-        <item name="quickContactBadgeStyleWindowLarge">@android:style/Widget.QuickContactBadge.WindowLarge</item>
-        <item name="quickContactBadgeStyleSmallWindowSmall">@android:style/Widget.QuickContactBadgeSmall.WindowSmall</item>
-        <item name="quickContactBadgeStyleSmallWindowMedium">@android:style/Widget.QuickContactBadgeSmall.WindowMedium</item>
-        <item name="quickContactBadgeStyleSmallWindowLarge">@android:style/Widget.QuickContactBadgeSmall.WindowLarge</item>
-
-        <!-- Preference styles -->
-        <item name="preferenceScreenStyle">@android:style/Preference.PreferenceScreen</item>
-        <item name="preferenceCategoryStyle">@android:style/Preference.Category</item>
-        <item name="preferenceStyle">@android:style/Preference</item>
-        <item name="preferenceInformationStyle">@android:style/Preference.Information</item>
-        <item name="checkBoxPreferenceStyle">@android:style/Preference.CheckBoxPreference</item>
-        <item name="yesNoPreferenceStyle">@android:style/Preference.DialogPreference.YesNoPreference</item>
-        <item name="dialogPreferenceStyle">@android:style/Preference.DialogPreference</item>
-        <item name="editTextPreferenceStyle">@android:style/Preference.DialogPreference.EditTextPreference</item>
-        <item name="ringtonePreferenceStyle">@android:style/Preference.RingtonePreference</item>
-        <item name="preferenceLayoutChild">@android:layout/preference_child</item>
-
-        <!-- Search widget styles -->
-        <item name="searchWidgetCorpusItemBackground">@android:color/search_widget_corpus_item_background</item>
-    </style>
-
-    <!-- Variant of the default (dark) theme with no title bar -->
-    <style name="Theme.NoTitleBar">
-        <item name="android:windowNoTitle">true</item>
-    </style>
-
-    <!-- Variant of the default (dark) theme that has no title bar and
-         fills the entire screen -->
-    <style name="Theme.NoTitleBar.Fullscreen">
-        <item name="android:windowFullscreen">true</item>
-        <item name="android:windowContentOverlay">@null</item>
-    </style>
-
-    <!-- Theme for a light background with dark text on top.  Set your activity
-         to this theme if you would like such an appearance.  As with the
-         default theme, you should try to assume little more than that the
-         background will be a light color. -->
-    <style name="Theme.Light">
-        <item name="windowBackground">@drawable/screen_background_light</item>
-        <item name="colorBackground">@android:color/background_light</item>
-        <item name="colorForeground">@color/bright_foreground_light</item>
-        <item name="colorForegroundInverse">@android:color/bright_foreground_light_inverse</item>
-
-        <item name="textColorPrimary">@android:color/primary_text_light</item>
-        <item name="textColorSecondary">@android:color/secondary_text_light</item>
-        <item name="textColorTertiary">@android:color/tertiary_text_light</item>
-        <item name="textColorPrimaryInverse">@android:color/primary_text_dark</item>
-        <item name="textColorSecondaryInverse">@android:color/secondary_text_dark</item>
-        <item name="textColorTertiaryInverse">@android:color/tertiary_text_dark</item>
-        <item name="textColorPrimaryDisableOnly">@android:color/primary_text_light_disable_only</item>
-        <item name="textColorPrimaryInverseDisableOnly">@android:color/primary_text_dark_disable_only</item>
-        <item name="textColorPrimaryNoDisable">@android:color/primary_text_light_nodisable</item>
-        <item name="textColorSecondaryNoDisable">@android:color/secondary_text_light_nodisable</item>
-        <item name="textColorPrimaryInverseNoDisable">@android:color/primary_text_dark_nodisable</item>
-        <item name="textColorSecondaryInverseNoDisable">@android:color/secondary_text_dark_nodisable</item>
-        <item name="textColorHint">@android:color/hint_foreground_light</item>
-        <item name="textColorHintInverse">@android:color/hint_foreground_dark</item>
-
-        <item name="popupWindowStyle">@android:style/Widget.PopupWindow</item>
-
-        <item name="textCheckMark">@android:drawable/indicator_check_mark_light</item>
-        <item name="textCheckMarkInverse">@android:drawable/indicator_check_mark_dark</item>
-
-        <item name="gestureOverlayViewStyle">@android:style/Widget.GestureOverlayView.White</item>
-        <item name="expandableListViewStyle">@android:style/Widget.ExpandableListView.White</item>
-        <item name="listViewStyle">@android:style/Widget.ListView.White</item>
-        <item name="listDivider">@drawable/divider_horizontal_bright</item>
-        <item name="listSeparatorTextViewStyle">@android:style/Widget.TextView.ListSeparator.White</item>
-
-        <item name="progressBarStyle">@android:style/Widget.ProgressBar.Inverse</item>
-                <item name="progressBarStyleSmall">@android:style/Widget.ProgressBar.Small.Inverse</item>
-                <item name="progressBarStyleLarge">@android:style/Widget.ProgressBar.Large.Inverse</item>
-                <item name="progressBarStyleInverse">@android:style/Widget.ProgressBar</item>
-                <item name="progressBarStyleSmallInverse">@android:style/Widget.ProgressBar.Small</item>
-                <item name="progressBarStyleLargeInverse">@android:style/Widget.ProgressBar.Large</item>
-    </style>
-
-    <!-- Variant of the light theme with no title bar -->
-    <style name="Theme.Light.NoTitleBar">
-        <item name="android:windowNoTitle">true</item>
-    </style>
-
-    <!-- Variant of the light theme that has no title bar and
-         fills the entire screen -->
-    <style name="Theme.Light.NoTitleBar.Fullscreen">
-        <item name="android:windowFullscreen">true</item>
-        <item name="android:windowContentOverlay">@null</item>
-    </style>
-
-    <!-- Special variation on the default theme that ensures the background is
-         completely black.  This is useful for things like image viewers and
-         media players.   If you want the normal (dark background) theme
-         do <em>not</em> use this, use {@link #Theme}. -->
-    <style name="Theme.Black">
-        <item name="android:windowBackground">@android:color/black</item>
-        <item name="android:colorBackground">@android:color/black</item>
-    </style>
-
-    <!-- Variant of the black theme with no title bar -->
-    <style name="Theme.Black.NoTitleBar">
-        <item name="android:windowNoTitle">true</item>
-    </style>
-
-    <!-- Variant of the black theme that has no title bar and
-         fills the entire screen -->
-    <style name="Theme.Black.NoTitleBar.Fullscreen">
-        <item name="android:windowFullscreen">true</item>
-        <item name="android:windowContentOverlay">@null</item>
-    </style>
-
-    <!-- Default theme for windows that want to have the user's selected
-         wallpaper appear behind them.  -->
-    <style name="Theme.Wallpaper">
-        <item name="android:windowBackground">@android:color/transparent</item>
-        <item name="android:colorBackgroundCacheHint">@null</item>
-        <item name="android:windowShowWallpaper">true</item>
-    </style>
-
-    <!-- Variant of the translucent theme with no title bar -->
-    <style name="Theme.Wallpaper.NoTitleBar">
-        <item name="android:windowNoTitle">true</item>
-    </style>
-
-    <!-- Variant of the translucent theme that has no title bar and
-         fills the entire screen -->
-    <style name="Theme.Wallpaper.NoTitleBar.Fullscreen">
-        <item name="android:windowFullscreen">true</item>
-        <item name="android:windowContentOverlay">@null</item>
-    </style>
-
-    <!-- Theme for a wallpaper's setting activity that is designed to be on
-         top of a dark background. -->
-    <style name="Theme.WallpaperSettings">
-        <item name="android:windowBackground">@android:drawable/screen_background_dark_transparent</item>
-        <item name="android:colorBackgroundCacheHint">@null</item>
-        <item name="android:windowIsTranslucent">true</item>
-        <item name="android:windowAnimationStyle">@android:style/Animation.Translucent</item>
-    </style>
-
-    <!-- Theme for a wallpaper's setting activity that is designed to be on
-         top of a light background. -->
-    <style name="Theme.Light.WallpaperSettings">
-        <item name="android:windowBackground">@android:drawable/screen_background_light_transparent</item>
-        <item name="android:colorBackgroundCacheHint">@null</item>
-        <item name="android:windowIsTranslucent">true</item>
-        <item name="android:windowAnimationStyle">@android:style/Animation.Translucent</item>
-    </style>
-
-    <!-- Style to apply on top of a wallpaper settings theme when it is being
-         shown on top of the real wallpaper -->
-    <style name="ActiveWallpaperSettings">
-    </style>
-
-    <!-- Style to apply on top of a wallpaper settings theme when it is being
-         shown on top of the real wallpaper -->
-    <style name="PreviewWallpaperSettings">
-    </style>
-
-    <!-- Default theme for translucent activities, that is windows that allow you
-         to see through them to the windows behind.  This sets up the translucent
-         flag and appropriate animations for your windows.  -->
-    <style name="Theme.Translucent">
-        <item name="android:windowBackground">@android:color/transparent</item>
-        <item name="android:colorBackgroundCacheHint">@null</item>
-        <item name="android:windowIsTranslucent">true</item>
-        <!-- Note that we use the base animation style here (that is no
-             animations) because we really have no idea how this kind of
-             activity will be used. -->
-        <item name="android:windowAnimationStyle">@android:style/Animation</item>
-    </style>
-
-    <!-- Variant of the translucent theme with no title bar -->
-    <style name="Theme.Translucent.NoTitleBar">
-        <item name="android:windowNoTitle">true</item>
-        <item name="android:windowContentOverlay">@null</item>
-    </style>
-
-    <!-- Variant of the translucent theme that has no title bar and
-         fills the entire screen -->
-    <style name="Theme.Translucent.NoTitleBar.Fullscreen">
-        <item name="android:windowFullscreen">true</item>
-    </style>
-
-    <!-- Default theme for activities that don't actually display a UI; that
-         is, they finish themselves before being resumed.  -->
-    <style name="Theme.NoDisplay">
-        <item name="android:windowBackground">@null</item>
-        <item name="android:windowContentOverlay">@null</item>
-        <item name="android:windowIsTranslucent">true</item>
-        <item name="android:windowAnimationStyle">@null</item>
-        <item name="android:windowDisablePreview">true</item>
-        <item name="android:windowNoDisplay">true</item>
-    </style>
-
-    <!-- Default theme for dialog windows and activities, which is used by the
-         {@link android.app.Dialog} class.  This changes the window to be
-         floating (not fill the entire screen), and puts a frame around its
-         contents.  You can set this theme on an activity if you would like to
-         make an activity that looks like a Dialog. -->
-    <style name="Theme.Dialog">
-        <item name="android:windowFrame">@null</item>
-        <item name="android:windowTitleStyle">@android:style/DialogWindowTitle</item>
-        <item name="android:windowBackground">@android:drawable/panel_background</item>
-        <item name="android:windowIsFloating">true</item>
-        <item name="android:windowContentOverlay">@null</item>
-        <item name="android:windowAnimationStyle">@android:style/Animation.Dialog</item>
-        <item name="android:windowSoftInputMode">stateUnspecified|adjustPan</item>
-
-        <item name="android:colorBackgroundCacheHint">@null</item>
-
-        <item name="textAppearance">@android:style/TextAppearance</item>
-        <item name="textAppearanceInverse">@android:style/TextAppearance.Inverse</item>
-
-        <item name="textColorPrimary">@android:color/primary_text_dark</item>
-        <item name="textColorSecondary">@android:color/secondary_text_dark</item>
-        <item name="textColorTertiary">@android:color/tertiary_text_dark</item>
-        <item name="textColorPrimaryInverse">@android:color/primary_text_light</item>
-        <item name="textColorSecondaryInverse">@android:color/secondary_text_light</item>
-        <item name="textColorTertiaryInverse">@android:color/tertiary_text_light</item>
-        <item name="textColorPrimaryDisableOnly">@android:color/primary_text_dark_disable_only</item>
-        <item name="textColorPrimaryInverseDisableOnly">@android:color/primary_text_light_disable_only</item>
-        <item name="textColorPrimaryNoDisable">@android:color/primary_text_dark_nodisable</item>
-        <item name="textColorSecondaryNoDisable">@android:color/secondary_text_dark_nodisable</item>
-        <item name="textColorPrimaryInverseNoDisable">@android:color/primary_text_light_nodisable</item>
-        <item name="textColorSecondaryInverseNoDisable">@android:color/secondary_text_light_nodisable</item>
-        <item name="textColorHint">@android:color/hint_foreground_dark</item>
-        <item name="textColorHintInverse">@android:color/hint_foreground_light</item>
-        <item name="textColorSearchUrl">@android:color/search_url_text</item>
-
-        <item name="textAppearanceLarge">@android:style/TextAppearance.Large</item>
-        <item name="textAppearanceMedium">@android:style/TextAppearance.Medium</item>
-        <item name="textAppearanceSmall">@android:style/TextAppearance.Small</item>
-        <item name="textAppearanceLargeInverse">@android:style/TextAppearance.Large.Inverse</item>
-        <item name="textAppearanceMediumInverse">@android:style/TextAppearance.Medium.Inverse</item>
-        <item name="textAppearanceSmallInverse">@android:style/TextAppearance.Small.Inverse</item>
-    </style>
-
-    <!-- Default theme for alert dialog windows, which is used by the
-         {@link android.app.AlertDialog} class.  This is basically a dialog
-         but sets the background to empty so it can do two-tone backgrounds. -->
-    <style name="Theme.Dialog.Alert">
-        <item name="windowBackground">@android:color/transparent</item>
-        <item name="windowTitleStyle">@android:style/DialogWindowTitle</item>
-        <item name="windowIsFloating">true</item>
-        <item name="windowContentOverlay">@null</item>
-    </style>
-
-    <!-- Default dark theme for panel windows.  This removes all extraneous
-         window decorations, so you basically have an empty rectangle in which
-         to place your content.  It makes the window floating, with a transparent
-         background, and turns off dimming behind the window. -->
-    <style name="Theme.Panel">
-        <item name="android:windowBackground">@android:color/transparent</item>
-        <item name="android:colorBackgroundCacheHint">@null</item>
-        <item name="android:windowFrame">@null</item>
-        <item name="android:windowContentOverlay">@null</item>
-        <item name="android:windowIsFloating">true</item>
-        <item name="android:backgroundDimEnabled">false</item>
-        <item name="android:windowIsTranslucent">true</item>
-        <item name="android:windowNoTitle">true</item>
-    </style>
-
-    <!-- Default light theme for panel windows.  This removes all extraneous
-         window decorations, so you basically have an empty rectangle in which
-         to place your content.  It makes the window floating, with a transparent
-         background, and turns off dimming behind the window. -->
-    <style name="Theme.Light.Panel">
-        <item name="android:windowBackground">@android:color/transparent</item>
-        <item name="android:colorBackgroundCacheHint">@null</item>
-        <item name="android:windowFrame">@null</item>
-        <item name="android:windowContentOverlay">@null</item>
-        <item name="android:windowIsFloating">true</item>
-        <item name="android:backgroundDimEnabled">false</item>
-        <item name="android:windowIsTranslucent">true</item>
-        <item name="android:windowNoTitle">true</item>
-    </style>
-
-    <!-- Default theme for input methods, which is used by the
-         {@link android.inputmethodservice.InputMethodService} class.
-         this inherits from Theme.NoTitleBar, but makes the background
-         transparent, the window floating and translucent, and ensures that
-         it does not dim the UI behind it.  This also configures the window
-         with the standard IME animations and visuals. -->
-    <style name="Theme.InputMethod" parent="Theme.Panel">
-        <item name="android:windowAnimationStyle">@android:style/Animation.InputMethod</item>
-        <item name="android:imeFullscreenBackground">@android:drawable/input_method_fullscreen_background</item>
-        <item name="android:imeExtractEnterAnimation">@android:anim/input_method_extract_enter</item>
-        <item name="android:imeExtractExitAnimation">@android:anim/input_method_extract_exit</item>
-    </style>
-
-    <!-- Theme for the search input bar. -->
-    <style name="Theme.SearchBar" parent="Theme.Panel">
-        <item name="windowContentOverlay">@null</item>
-    </style>
-
-    <!-- Theme for the search input bar when doing global search. The only
-         difference from non-global search is that we do not dim the background. -->
-    <style name="Theme.GlobalSearchBar" parent="Theme.Panel">
-        <item name="windowContentOverlay">@null</item>
-    </style>
-
-    <!-- Menu Themes -->
-    <eat-comment />
-
-    <style name="Theme.IconMenu">
-        <!-- Menu/item attributes -->
-        <item name="android:itemTextAppearance">@android:style/TextAppearance.Widget.IconMenu.Item</item>
-        <item name="android:itemBackground">@android:drawable/menu_selector</item>
-        <item name="android:itemIconDisabledAlpha">?android:attr/disabledAlpha</item>
-        <item name="android:horizontalDivider">@android:drawable/divider_horizontal_dark</item>
-        <item name="android:verticalDivider">@android:drawable/divider_vertical_dark</item>
-        <item name="android:windowAnimationStyle">@android:style/Animation.OptionsPanel</item>
-        <item name="android:moreIcon">@android:drawable/ic_menu_more</item>
-        <item name="android:background">@null</item>
-    </style>
-
-    <style name="Theme.ExpandedMenu">
-        <!-- Menu/item attributes -->
-        <item name="android:itemTextAppearance">?android:attr/textAppearanceLarge</item>
-        <item name="android:listViewStyle">@android:style/Widget.ListView.Menu</item>
-        <item name="android:windowAnimationStyle">@android:style/Animation.OptionsPanel</item>
-        <item name="android:background">@null</item>
-    </style>
-
-    <!-- @hide -->
-    <style name="Theme.Dialog.AppError">
-        <item name="windowFrame">@null</item>
-        <item name="windowTitleStyle">@android:style/DialogWindowTitle</item>
-        <item name="windowBackground">@android:color/transparent</item>
-        <item name="windowIsFloating">true</item>
-        <item name="windowContentOverlay">@null</item>
-        <item name="textAppearance">@style/TextAppearance.Theme.Dialog.AppError</item>
-    </style>
-
-    <!-- Special theme for the recent apps dialog, to allow customization
-         with overlays. -->
-    <style name="Theme.Dialog.RecentApplications">
-        <item name="windowFrame">@null</item>
-        <item name="windowBackground">@android:color/transparent</item>
-        <item name="android:windowAnimationStyle">@android:style/Animation.RecentApplications</item>
-        <item name="android:textColor">@android:color/secondary_text_nofocus</item>
-    </style>
-
-    <!-- Default theme for window that looks like a toast. -->
-    <style name="Theme.Toast" parent="@android:style/Theme.Dialog">
-        <item name="android:windowBackground">@android:drawable/toast_frame</item>
-        <item name="android:windowAnimationStyle">@android:style/Animation.Toast</item>
-        <item name="android:backgroundDimEnabled">false</item>
-    </style>
-
-</resources>
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/ic_notification_overlay.9.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/ic_notification_overlay.9.png
deleted file mode 100644
index 6ff7f8b..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/ic_notification_overlay.9.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/shade_header_background.9.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/shade_header_background.9.png
deleted file mode 100755
index d4e189f..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/shade_header_background.9.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_2g3g_off.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_2g3g_off.png
deleted file mode 100755
index 0f25c97..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_2g3g_off.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_2g3g_on.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_2g3g_on.png
deleted file mode 100755
index 2e5ab13..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_2g3g_on.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_3g_on.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_3g_on.png
deleted file mode 100755
index e321ec2..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_3g_on.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_airplane_off.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_airplane_off.png
deleted file mode 100755
index 3861883..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_airplane_off.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_airplane_on.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_airplane_on.png
deleted file mode 100755
index e0f275b..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_airplane_on.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_bluetooth_off.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_bluetooth_off.png
deleted file mode 100755
index 8207d7e..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_bluetooth_off.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_bluetooth_on.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_bluetooth_on.png
deleted file mode 100755
index 7d56b7d..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_bluetooth_on.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_brightness_auto.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_brightness_auto.png
deleted file mode 100755
index 7acaa4d..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_brightness_auto.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_brightness_mid.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_brightness_mid.png
deleted file mode 100755
index 1419dcb..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_brightness_mid.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_brightness_off.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_brightness_off.png
deleted file mode 100755
index d618e16..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_brightness_off.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_brightness_on.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_brightness_on.png
deleted file mode 100755
index 183dc08..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_brightness_on.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_data_off.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_data_off.png
deleted file mode 100755
index d97e8b1..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_data_off.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_data_on.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_data_on.png
deleted file mode 100755
index 3baf67c..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_data_on.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_ecb_mode.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_ecb_mode.png
deleted file mode 100644
index 77fad6d..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_ecb_mode.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_flashlight_off.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_flashlight_off.png
deleted file mode 100755
index 41bb44f..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_flashlight_off.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_flashlight_on.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_flashlight_on.png
deleted file mode 100755
index 4f94404..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_flashlight_on.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_gps_off.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_gps_off.png
deleted file mode 100755
index 2c9b06b..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_gps_off.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_gps_on.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_gps_on.png
deleted file mode 100755
index f9ffbe5..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_gps_on.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_ing_off.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_ing_off.png
deleted file mode 100755
index 7b65eea..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_ing_off.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_lock_screen_off.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_lock_screen_off.png
deleted file mode 100755
index fa4e4e6..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_lock_screen_off.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_lock_screen_on.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_lock_screen_on.png
deleted file mode 100755
index 9190bf6..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_lock_screen_on.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_media_next.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_media_next.png
deleted file mode 100755
index 311cd34..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_media_next.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_media_pause.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_media_pause.png
deleted file mode 100755
index b600122..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_media_pause.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_media_play.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_media_play.png
deleted file mode 100755
index b2bf5c5..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_media_play.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_media_previous.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_media_previous.png
deleted file mode 100755
index b556027..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_media_previous.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_notify_alarm.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_notify_alarm.png
deleted file mode 100644
index 054ecc1..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_notify_alarm.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_orientation_off.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_orientation_off.png
deleted file mode 100755
index 557dd82..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_orientation_off.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_orientation_on.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_orientation_on.png
deleted file mode 100755
index 34c9553..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_orientation_on.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_ring_on.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_ring_on.png
deleted file mode 100755
index 00d4a71..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_ring_on.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_ring_vibrate_on.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_ring_vibrate_on.png
deleted file mode 100755
index 56a82dc..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_ring_vibrate_on.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_screen_timeout_off.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_screen_timeout_off.png
deleted file mode 100755
index 9544515..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_screen_timeout_off.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_screen_timeout_on.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_screen_timeout_on.png
deleted file mode 100755
index 42f2dab..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_screen_timeout_on.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_silent.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_silent.png
deleted file mode 100755
index a88577b..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_silent.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sleep.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sleep.png
deleted file mode 100755
index 9ba5dd6..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sleep.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sync_off.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sync_off.png
deleted file mode 100755
index defa9e0..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sync_off.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sync_on.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sync_on.png
deleted file mode 100755
index cc33436..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sync_on.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_bluetooth.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_bluetooth.png
deleted file mode 100644
index 42107f4..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_bluetooth.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_bluetooth_connected.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_bluetooth_connected.png
deleted file mode 100644
index ad2d9b1..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_bluetooth_connected.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_connected_1x.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_connected_1x.png
deleted file mode 100644
index b77f54c..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_connected_1x.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_connected_3g.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_connected_3g.png
deleted file mode 100644
index 2787293..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_connected_3g.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_connected_e.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_connected_e.png
deleted file mode 100644
index c9a7745..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_connected_e.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_connected_g.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_connected_g.png
deleted file mode 100644
index b4a8dae..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_connected_g.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_connected_h.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_connected_h.png
deleted file mode 100644
index fcfdab9..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_connected_h.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_fully_connected_1x.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_fully_connected_1x.png
deleted file mode 100644
index c8857c0..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_fully_connected_1x.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_fully_connected_3g.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_fully_connected_3g.png
deleted file mode 100644
index 8d572cd..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_fully_connected_3g.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_fully_connected_e.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_fully_connected_e.png
deleted file mode 100644
index 6421b16..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_fully_connected_e.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_fully_connected_g.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_fully_connected_g.png
deleted file mode 100644
index 83ae9a8..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_fully_connected_g.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_fully_connected_h.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_fully_connected_h.png
deleted file mode 100644
index 5b310fd..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_fully_connected_h.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_fully_in_1x.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_fully_in_1x.png
deleted file mode 100644
index 3a1f20e..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_fully_in_1x.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_fully_in_3g.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_fully_in_3g.png
deleted file mode 100644
index d134fce..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_fully_in_3g.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_fully_in_e.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_fully_in_e.png
deleted file mode 100644
index f15a63f..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_fully_in_e.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_fully_in_g.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_fully_in_g.png
deleted file mode 100644
index d0841bf..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_fully_in_g.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_fully_in_h.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_fully_in_h.png
deleted file mode 100644
index 6de373f..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_fully_in_h.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_fully_inandout_1x.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_fully_inandout_1x.png
deleted file mode 100644
index 86f9e0c..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_fully_inandout_1x.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_fully_inandout_3g.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_fully_inandout_3g.png
deleted file mode 100644
index 9fde214..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_fully_inandout_3g.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_fully_inandout_e.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_fully_inandout_e.png
deleted file mode 100644
index d5031ba..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_fully_inandout_e.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_fully_inandout_g.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_fully_inandout_g.png
deleted file mode 100644
index 1a8295a..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_fully_inandout_g.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_fully_inandout_h.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_fully_inandout_h.png
deleted file mode 100644
index ec25f94..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_fully_inandout_h.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_fully_out_1x.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_fully_out_1x.png
deleted file mode 100644
index 39a99a7..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_fully_out_1x.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_fully_out_3g.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_fully_out_3g.png
deleted file mode 100644
index dc91822..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_fully_out_3g.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_fully_out_e.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_fully_out_e.png
deleted file mode 100644
index 083f10c..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_fully_out_e.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_fully_out_g.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_fully_out_g.png
deleted file mode 100644
index 4ec5c10..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_fully_out_g.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_fully_out_h.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_fully_out_h.png
deleted file mode 100644
index bdc1df8..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_fully_out_h.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_in_1x.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_in_1x.png
deleted file mode 100644
index 6420498..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_in_1x.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_in_3g.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_in_3g.png
deleted file mode 100644
index 8b1f9a7..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_in_3g.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_in_e.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_in_e.png
deleted file mode 100644
index d4d0d2d..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_in_e.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_in_g.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_in_g.png
deleted file mode 100644
index 6681163..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_in_g.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_in_h.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_in_h.png
deleted file mode 100644
index 1b38dff..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_in_h.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_inandout_1x.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_inandout_1x.png
deleted file mode 100644
index cea7acb..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_inandout_1x.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_inandout_3g.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_inandout_3g.png
deleted file mode 100644
index f7c3a6e..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_inandout_3g.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_inandout_e.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_inandout_e.png
deleted file mode 100644
index 1efc023..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_inandout_e.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_inandout_g.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_inandout_g.png
deleted file mode 100644
index 36bb526..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_inandout_g.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_inandout_h.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_inandout_h.png
deleted file mode 100644
index 079496e..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_inandout_h.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_out_1x.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_out_1x.png
deleted file mode 100644
index 69d7b06..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_out_1x.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_out_3g.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_out_3g.png
deleted file mode 100644
index f6aa391..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_out_3g.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_out_e.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_out_e.png
deleted file mode 100644
index 69c401f..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_out_e.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_out_g.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_out_g.png
deleted file mode 100644
index 14e9e7b..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_out_g.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_out_h.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_out_h.png
deleted file mode 100644
index 36fc122..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_data_out_h.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_gps_acquiring.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_gps_acquiring.png
deleted file mode 100644
index 8739f13..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_gps_acquiring.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_headset_no_mic.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_headset_no_mic.png
deleted file mode 100644
index 206c4ce..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_headset_no_mic.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_no_sim.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_no_sim.png
deleted file mode 100644
index 2de37d8..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_no_sim.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_r_signal_0.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_r_signal_0.png
deleted file mode 100644
index 6d6a302..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_r_signal_0.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_r_signal_0_fully.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_r_signal_0_fully.png
deleted file mode 100644
index 6d6a302..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_r_signal_0_fully.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_r_signal_1.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_r_signal_1.png
deleted file mode 100644
index ad9760e..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_r_signal_1.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_r_signal_1_fully.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_r_signal_1_fully.png
deleted file mode 100644
index 0b93329..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_r_signal_1_fully.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_r_signal_2.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_r_signal_2.png
deleted file mode 100644
index 51b8e91..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_r_signal_2.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_r_signal_2_fully.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_r_signal_2_fully.png
deleted file mode 100644
index 7f697d9..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_r_signal_2_fully.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_r_signal_3.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_r_signal_3.png
deleted file mode 100644
index c4aa1fa..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_r_signal_3.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_r_signal_3_fully.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_r_signal_3_fully.png
deleted file mode 100644
index 9f7ff05..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_r_signal_3_fully.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_r_signal_4.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_r_signal_4.png
deleted file mode 100644
index 49120ee..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_r_signal_4.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_r_signal_4_fully.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_r_signal_4_fully.png
deleted file mode 100644
index 28300ed..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_r_signal_4_fully.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_ringer_silent.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_ringer_silent.png
deleted file mode 100644
index 50cde0c..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_ringer_silent.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_ringer_vibrate.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_ringer_vibrate.png
deleted file mode 100644
index d621137..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_ringer_vibrate.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_signal_0.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_signal_0.png
deleted file mode 100644
index 90798d1..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_signal_0.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_signal_0_cdma.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_signal_0_cdma.png
deleted file mode 100644
index 1895d26..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_signal_0_cdma.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_signal_0_fully.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_signal_0_fully.png
deleted file mode 100644
index 90798d1..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_signal_0_fully.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_signal_1.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_signal_1.png
deleted file mode 100644
index 9ffaa00..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_signal_1.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_signal_1_cdma.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_signal_1_cdma.png
deleted file mode 100644
index 4eec9d3..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_signal_1_cdma.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_signal_1_fully.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_signal_1_fully.png
deleted file mode 100644
index c7a25da..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_signal_1_fully.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_signal_2.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_signal_2.png
deleted file mode 100644
index ccb7acc..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_signal_2.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_signal_2_cdma.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_signal_2_cdma.png
deleted file mode 100644
index f033ba5..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_signal_2_cdma.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_signal_2_fully.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_signal_2_fully.png
deleted file mode 100644
index 4258c3a..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_signal_2_fully.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_signal_3.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_signal_3.png
deleted file mode 100644
index 2cb6a9e..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_signal_3.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_signal_3_cdma.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_signal_3_cdma.png
deleted file mode 100644
index 39d16c6..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_signal_3_cdma.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_signal_3_fully.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_signal_3_fully.png
deleted file mode 100644
index ae520b4..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_signal_3_fully.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_signal_4.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_signal_4.png
deleted file mode 100644
index 83e179c..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_signal_4.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_signal_4_cdma.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_signal_4_cdma.png
deleted file mode 100644
index 413f52a..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_signal_4_cdma.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_signal_4_fully.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_signal_4_fully.png
deleted file mode 100644
index d210b79..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_signal_4_fully.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_signal_evdo_0.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_signal_evdo_0.png
deleted file mode 100644
index 9a1730e..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_signal_evdo_0.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_signal_evdo_1.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_signal_evdo_1.png
deleted file mode 100644
index d9fa62e..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_signal_evdo_1.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_signal_evdo_2.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_signal_evdo_2.png
deleted file mode 100644
index 8091efe..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_signal_evdo_2.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_signal_evdo_3.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_signal_evdo_3.png
deleted file mode 100644
index f86455f..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_signal_evdo_3.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_signal_evdo_4.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_signal_evdo_4.png
deleted file mode 100644
index 7475702..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_signal_evdo_4.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_signal_flightmode.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_signal_flightmode.png
deleted file mode 100644
index 4165d2e..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_signal_flightmode.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_signal_null.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_signal_null.png
deleted file mode 100644
index 2397f97..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_signal_null.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_wifi_signal_0.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_wifi_signal_0.png
deleted file mode 100644
index 41cd784..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_wifi_signal_0.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_wifi_signal_1.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_wifi_signal_1.png
deleted file mode 100644
index bd0f0ca..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_wifi_signal_1.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_wifi_signal_1_fully.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_wifi_signal_1_fully.png
deleted file mode 100644
index 8ba5a83..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_wifi_signal_1_fully.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_wifi_signal_2.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_wifi_signal_2.png
deleted file mode 100644
index 77679ef..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_wifi_signal_2.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_wifi_signal_2_fully.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_wifi_signal_2_fully.png
deleted file mode 100644
index d40d9b9..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_wifi_signal_2_fully.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_wifi_signal_3.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_wifi_signal_3.png
deleted file mode 100644
index 210e25f..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_wifi_signal_3.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_wifi_signal_3_fully.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_wifi_signal_3_fully.png
deleted file mode 100644
index 1afef5d..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_wifi_signal_3_fully.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_wifi_signal_4.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_wifi_signal_4.png
deleted file mode 100644
index acae535..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_wifi_signal_4.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_wifi_signal_4_fully.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_wifi_signal_4_fully.png
deleted file mode 100644
index abf9a47..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_sys_wifi_signal_4_fully.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_vibrate_off.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_vibrate_off.png
deleted file mode 100755
index ec19ed2..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_vibrate_off.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_vibrate_on.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_vibrate_on.png
deleted file mode 100755
index ec19ed2..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_vibrate_on.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_wifi_ap_off.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_wifi_ap_off.png
deleted file mode 100755
index 10f6de9..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_wifi_ap_off.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_wifi_ap_on.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_wifi_ap_on.png
deleted file mode 100755
index 97c0aa7..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_wifi_ap_on.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_wifi_off.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_wifi_off.png
deleted file mode 100755
index 829bd74..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_wifi_off.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_wifi_on.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_wifi_on.png
deleted file mode 100755
index 8a34090..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/stat_wifi_on.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/status_bar_close_on.9.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/status_bar_close_on.9.png
deleted file mode 100644
index 8633d58..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/status_bar_close_on.9.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/statusbar_background.9.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/statusbar_background.9.png
deleted file mode 100644
index 0f46044..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/statusbar_background.9.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/title_bar_portrait.9.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/title_bar_portrait.9.png
deleted file mode 100644
index 7775449..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/title_bar_portrait.9.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/title_bar_shadow.9.png b/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/title_bar_shadow.9.png
deleted file mode 100644
index 196e8fc..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/drawable-ldpi/title_bar_shadow.9.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/layout/status_bar_expanded.xml b/overlay/ldpi/frameworks/base/packages/SystemUI/res/layout/status_bar_expanded.xml
deleted file mode 100644
index 71adf8e..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/layout/status_bar_expanded.xml
+++ /dev/null
@@ -1,187 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* apps/common/assets/default/default/skins/StatusBar.xml
-**
-** Copyright 2006, The Android Open Source Project
-** Patched by Sven Dawitz; Copyright (C) 2011 CyanogenMod Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<com.android.systemui.statusbar.ExpandedView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:focusable="true"
-    android:descendantFocusability="afterDescendants"
-    >
-
-    <LinearLayout
-        android:id="@+id/power_and_carrier"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:paddingTop="3dp"
-        android:paddingBottom="5dp"
-        android:paddingRight="3dp"
-        android:background="@drawable/title_bar_portrait"
-        >
-        <com.android.systemui.statusbar.powerwidget.PowerWidget android:id="@+id/exp_power_stat"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            />
-
-        <LinearLayout android:id="@+id/carrier_label_layout"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:gravity="center_vertical"
-        >
-            <com.android.systemui.statusbar.CarrierLabel
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:layout_marginTop="1dp"
-                android:layout_marginLeft="5dp"
-                android:layout_gravity="center_vertical"
-                android:paddingBottom="1dp"
-                android:paddingLeft="4dp"
-                android:textAppearance="?android:attr/textAppearanceLarge"
-                android:textColor="@color/carrier_label_text_color"
-                />
-            <TextView android:id="@+id/clear_all_button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:layout_marginTop="4dp"
-                android:layout_marginBottom="1dp"
-                android:textSize="14sp"
-                android:textColor="#ff000000"
-                android:text="@string/status_bar_clear_all_button"
-                style="?android:attr/buttonStyle"
-                android:paddingLeft="15dp"
-                android:paddingRight="15dp"
-                android:background="@android:drawable/btn_default_small"
-            />
-        </LinearLayout>
-    </LinearLayout>
-
-    <FrameLayout android:id="@+id/notifications"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        >
-        <ScrollView
-            android:id="@+id/scroll"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:fadingEdge="none"
-            android:overScrollMode="ifContentScrolls"
-            >
-            <com.android.systemui.statusbar.NotificationLinearLayout
-                android:id="@+id/notificationLinearLayout"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                >
-
-                <TextView android:id="@+id/noNotificationsTitle"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:background="@drawable/shade_header_background"
-                    android:paddingLeft="5dp"
-                    android:textAppearance="@style/TextAppearance.StatusBar.Title"
-                    android:text="@string/status_bar_no_notifications_title"
-                    />
-
-                <TextView android:id="@+id/ongoingTitle"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:background="@drawable/shade_header_background"
-                    android:paddingLeft="5dp"
-                    android:textAppearance="@style/TextAppearance.StatusBar.Title"
-                    android:text="@string/status_bar_ongoing_events_title"
-                    />
-                <LinearLayout android:id="@+id/ongoingItems"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    />
-
-                <TextView android:id="@+id/latestTitle"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:background="@drawable/shade_header_background"
-                    android:paddingLeft="5dp"
-                    android:textAppearance="@style/TextAppearance.StatusBar.Title"
-                    android:text="@string/status_bar_latest_events_title"
-                    />
-                <LinearLayout android:id="@+id/latestItems"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    />
-                <TextView android:id="@+id/compact_clear_all_button"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="right|center_vertical"
-                    android:layout_marginTop="4dp"
-                    android:layout_marginBottom="1dp"
-                    android:text="@string/status_bar_clear_all_button"
-                    style="@style/StatusBar.ClearButton"
-                    android:paddingLeft="15dp"
-                    android:paddingRight="15dp"
-                />
-            </com.android.systemui.statusbar.NotificationLinearLayout>
-        </ScrollView>
-        <ScrollView
-            android:id="@+id/bottomScroll"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:fadingEdge="none"
-            android:overScrollMode="ifContentScrolls"
-            >
-            <com.android.systemui.statusbar.NotificationLinearLayout
-                android:id="@+id/bottomNotificationLinearLayout"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:layout_gravity="bottom"
-                />
-        </ScrollView>
-
-        <LinearLayout android:id="@+id/compact_carrier_layout"
-            android:orientation="horizontal"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            >
-            <com.android.systemui.statusbar.CarrierLabel
-                 android:gravity="bottom|right|center"
-                 android:textAppearance="@style/TextAppearance.StatusBar.Title"
-                 android:singleLine="true"
-                 android:background="@android:color/transparent"
-                 android:layout_marginRight="6.0dip"
-                 android:layout_width="fill_parent"
-                 android:layout_height="wrap_content"
-                 android:layout_alignParentRight="true"
-                 />
-        </LinearLayout>
-
-        <ImageView
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:src="@drawable/title_bar_shadow"
-            android:scaleType="fitXY"
-        />
-
-    </FrameLayout>
-</com.android.systemui.statusbar.ExpandedView>
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/values/styles.xml b/overlay/ldpi/frameworks/base/packages/SystemUI/res/values/styles.xml
deleted file mode 100644
index 24169b9..0000000
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/values/styles.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2006 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <style name="TextAppearance.StatusBar.Title" parent="@android:style/TextAppearance.StatusBar">
-        <item name="android:textSize">16sp</item>
-        <item name="android:textStyle">bold</item>
-        <item name="android:textColor">@drawable/notification_header_text_color</item>
-    </style>
-
-    <style name="TextAppearance.StatusBar.CarrierLabel" parent="@android:style/TextAppearance.Large">
-        <item name="android:textColor">@color/carrier_label_text_color</item>
-    </style>
-
-    <style name="StatusBar.ClearButton" parent="@android:style/Widget.Button">
-        <item name="android:textColor">@color/clear_button_text_color</item>
-        <item name="android:textSize">14sp</item>
-        <item name="android:background">@android:drawable/btn_default_small</item>
-    </style>
-
-    <style name="TextAppearance.StatusBar.IntruderAlert"
-        parent="@android:style/TextAppearance.StatusBar">
-    </style>
-</resources>
diff --git a/overlay/ldpi/packages/apps/ADWLauncher/res/layout/widget_span_setup.xml b/overlay/ldpi/packages/apps/ADWLauncher/res/layout/widget_span_setup.xml
deleted file mode 100644
index 0ebb562..0000000
--- a/overlay/ldpi/packages/apps/ADWLauncher/res/layout/widget_span_setup.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* Copyright (C) 2009 Michael Novak <mike@androidnerds.org>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-<LinearLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:orientation="vertical"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:id="@+id/layout_root"
-        >
-        <LinearLayout
-                android:orientation="horizontal"
-                android:layout_width="fill_parent"
-                android:layout_height="fill_parent"
-                android:padding="5dp"
-                android:layout_weight="1.0"
-                >
-            <TextView
-                android:id="@+id/text_columns_span"
-                android:layout_width="fill_parent"
-                android:layout_height="fill_parent"
-                android:layout_weight="1.0"
-                android:gravity="center_horizontal"
-                android:text="@string/widget_columns"/>
-            <TextView
-                android:id="@+id/text_rows_span"
-                android:layout_width="fill_parent"
-                android:layout_height="fill_parent"
-                android:layout_weight="1.0"
-                android:gravity="center_horizontal"
-                android:text="@string/widget_rows"/>
-
-        </LinearLayout>
-        <LinearLayout
-                android:orientation="horizontal"
-                android:layout_width="fill_parent"
-                android:layout_height="fill_parent"
-                android:padding="5dp"
-                android:layout_weight="1.0"
-                >
-            <com.android.launcher.NumberPicker
-                android:id="@+id/widget_columns_span"
-                android:layout_width="fill_parent"
-                android:layout_height="fill_parent"
-                android:layout_weight="1.0"/>
-            <com.android.launcher.NumberPicker
-                android:id="@+id/widget_rows_span"
-                android:layout_width="fill_parent"
-                android:layout_height="fill_parent"
-                android:layout_weight="1.0" />
-
-        </LinearLayout>
-</LinearLayout>
-
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/cyanogenmod_icon.png b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/cyanogenmod_icon.png
deleted file mode 100644
index bcb3ba4..0000000
--- a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/cyanogenmod_icon.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_beki1984_colorwave.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_beki1984_colorwave.jpg
deleted file mode 100755
index a8befb3..0000000
--- a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_beki1984_colorwave.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_beki1984_colorwave_small.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_beki1984_colorwave_small.jpg
deleted file mode 100755
index 403c3e5..0000000
--- a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_beki1984_colorwave_small.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_boobies.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_boobies.jpg
deleted file mode 100644
index f0962f4..0000000
--- a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_boobies.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_boobies_small.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_boobies_small.jpg
deleted file mode 100644
index 49ee836..0000000
--- a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_boobies_small.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_cm_nexus_08.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_cm_nexus_08.jpg
deleted file mode 100644
index 7f7cacd..0000000
--- a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_cm_nexus_08.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_cm_nexus_08_small.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_cm_nexus_08_small.jpg
deleted file mode 100644
index bfadb00..0000000
--- a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_cm_nexus_08_small.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_eklipze_notquitemono.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_eklipze_notquitemono.jpg
deleted file mode 100755
index 87d4507..0000000
--- a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_eklipze_notquitemono.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_eklipze_notquitemono_small.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_eklipze_notquitemono_small.jpg
deleted file mode 100755
index 4273e4c..0000000
--- a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_eklipze_notquitemono_small.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_eklipze_technicolor.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_eklipze_technicolor.jpg
deleted file mode 100755
index 07a5e55..0000000
--- a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_eklipze_technicolor.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_eklipze_technicolor_small.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_eklipze_technicolor_small.jpg
deleted file mode 100755
index c57ced3..0000000
--- a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_eklipze_technicolor_small.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_fitsnugly_8bit.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_fitsnugly_8bit.jpg
deleted file mode 100644
index ecb449d..0000000
--- a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_fitsnugly_8bit.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_fitsnugly_8bit_small.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_fitsnugly_8bit_small.jpg
deleted file mode 100644
index 2aa881b..0000000
--- a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_fitsnugly_8bit_small.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_fitsnugly_cmearth.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_fitsnugly_cmearth.jpg
deleted file mode 100644
index 60bab36..0000000
--- a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_fitsnugly_cmearth.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_fitsnugly_cmearth_small.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_fitsnugly_cmearth_small.jpg
deleted file mode 100644
index c8bab70..0000000
--- a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_fitsnugly_cmearth_small.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_hazybluedots.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_hazybluedots.jpg
deleted file mode 100644
index 104ae43..0000000
--- a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_hazybluedots.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_hazybluedots_small.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_hazybluedots_small.jpg
deleted file mode 100644
index 92da2cf..0000000
--- a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_hazybluedots_small.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmbrickwall.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmbrickwall.jpg
deleted file mode 100644
index 1ea40c4..0000000
--- a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmbrickwall.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmbrickwall_small.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmbrickwall_small.jpg
deleted file mode 100644
index 4e112ac..0000000
--- a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmbrickwall_small.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmceation.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmceation.jpg
deleted file mode 100644
index da07bc0..0000000
--- a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmceation.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmceation_small.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmceation_small.jpg
deleted file mode 100644
index 30d2e1a..0000000
--- a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmceation_small.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmchrome.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmchrome.jpg
deleted file mode 100644
index d08c7b9..0000000
--- a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmchrome.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmchrome_small.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmchrome_small.jpg
deleted file mode 100644
index 1033cfe..0000000
--- a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmchrome_small.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmdiamondplate.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmdiamondplate.jpg
deleted file mode 100644
index c4667af..0000000
--- a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmdiamondplate.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmdiamondplate_small.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmdiamondplate_small.jpg
deleted file mode 100644
index 55729fa..0000000
--- a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmdiamondplate_small.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmmodern.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmmodern.jpg
deleted file mode 100644
index 5b91914..0000000
--- a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmmodern.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmmodern_small.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmmodern_small.jpg
deleted file mode 100644
index 17236fb..0000000
--- a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmmodern_small.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmmoderntint.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmmoderntint.jpg
deleted file mode 100644
index 474046c..0000000
--- a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmmoderntint.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmmoderntint_small.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmmoderntint_small.jpg
deleted file mode 100644
index 2a27c52..0000000
--- a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmmoderntint_small.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmorb.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmorb.jpg
deleted file mode 100644
index 2c40de4..0000000
--- a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmorb.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmorb_small.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmorb_small.jpg
deleted file mode 100644
index 49590b7..0000000
--- a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmorb_small.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmskateteam.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmskateteam.jpg
deleted file mode 100644
index 757ede6..0000000
--- a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmskateteam.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmskateteam_small.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmskateteam_small.jpg
deleted file mode 100644
index 5db394e..0000000
--- a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmskateteam_small.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmwoodedbg.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmwoodedbg.jpg
deleted file mode 100644
index 7dc8d03..0000000
--- a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmwoodedbg.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmwoodedbg_small.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmwoodedbg_small.jpg
deleted file mode 100644
index 146bc16..0000000
--- a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmwoodedbg_small.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_kanged_azenis2.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_kanged_azenis2.jpg
deleted file mode 100644
index 6542914..0000000
--- a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_kanged_azenis2.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_kanged_azenis2_small.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_kanged_azenis2_small.jpg
deleted file mode 100644
index af8fa2c..0000000
--- a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_kanged_azenis2_small.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_keithswisher_samuraix.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_keithswisher_samuraix.jpg
deleted file mode 100755
index b15f2e4..0000000
--- a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_keithswisher_samuraix.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_keithswisher_samuraix_small.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_keithswisher_samuraix_small.jpg
deleted file mode 100755
index c40d188..0000000
--- a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_keithswisher_samuraix_small.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_michaelmedina_beachlogs.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_michaelmedina_beachlogs.jpg
deleted file mode 100755
index 88e9c84..0000000
--- a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_michaelmedina_beachlogs.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_michaelmedina_beachlogs_small.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_michaelmedina_beachlogs_small.jpg
deleted file mode 100755
index 491df7e..0000000
--- a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_michaelmedina_beachlogs_small.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_arrowd_blue.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_arrowd_blue.jpg
deleted file mode 100644
index 2cd927b..0000000
--- a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_arrowd_blue.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_arrowd_blue_small.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_arrowd_blue_small.jpg
deleted file mode 100644
index 8521f6a..0000000
--- a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_arrowd_blue_small.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_arrowd_green.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_arrowd_green.jpg
deleted file mode 100644
index 05a1d67..0000000
--- a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_arrowd_green.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_arrowd_green_small.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_arrowd_green_small.jpg
deleted file mode 100644
index a32dbab..0000000
--- a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_arrowd_green_small.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_arrowd_pink.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_arrowd_pink.jpg
deleted file mode 100644
index a047b03..0000000
--- a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_arrowd_pink.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_arrowd_pink_small.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_arrowd_pink_small.jpg
deleted file mode 100644
index f54dd1e..0000000
--- a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_arrowd_pink_small.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_glows.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_glows.jpg
deleted file mode 100644
index 0c55665..0000000
--- a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_glows.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_glows_small.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_glows_small.jpg
deleted file mode 100644
index 4d54bae..0000000
--- a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_glows_small.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_lovecm.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_lovecm.jpg
deleted file mode 100644
index 7a62138..0000000
--- a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_lovecm.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_lovecm_small.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_lovecm_small.jpg
deleted file mode 100644
index 901b275..0000000
--- a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_lovecm_small.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_nexus_surf.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_nexus_surf.jpg
deleted file mode 100644
index fce806c..0000000
--- a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_nexus_surf.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_nexus_surf_small.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_nexus_surf_small.jpg
deleted file mode 100644
index a304ebd..0000000
--- a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_nexus_surf_small.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_revolutionary.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_revolutionary.jpg
deleted file mode 100755
index 7a8690a..0000000
--- a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_revolutionary.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_revolutionary_small.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_revolutionary_small.jpg
deleted file mode 100755
index e1c6489..0000000
--- a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_revolutionary_small.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_skate.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_skate.jpg
deleted file mode 100644
index 90e68ca..0000000
--- a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_skate.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_skate_small.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_skate_small.jpg
deleted file mode 100644
index 83b93dd..0000000
--- a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_skate_small.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/Calendar/res/drawable-ldpi/stat_notify_calendar.png b/overlay/ldpi/packages/apps/Calendar/res/drawable-ldpi/stat_notify_calendar.png
deleted file mode 100644
index d16e91a..0000000
--- a/overlay/ldpi/packages/apps/Calendar/res/drawable-ldpi/stat_notify_calendar.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/Contacts/res/layout-finger/dialpad.xml b/overlay/ldpi/packages/apps/Contacts/res/layout-finger/dialpad.xml
deleted file mode 100644
index 54442f5..0000000
--- a/overlay/ldpi/packages/apps/Contacts/res/layout-finger/dialpad.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2006 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Dialpad in the Contact app.
- -->
-
-<com.android.phone.ButtonGridLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/dialpad"
-    android:paddingLeft="7dp"
-    android:paddingRight="7dp"
-    android:paddingTop="2dp"
-    android:paddingBottom="1dp"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_gravity="center_horizontal"
-    android:layout_weight="1"
->
-        <ImageButton android:id="@+id/one"
-            android:layout_width="88dp"
-            android:layout_height="50dp"
-            android:src="@drawable/dial_num_1_no_vm"
-            android:background="@drawable/btn_dial"
-            android:soundEffectsEnabled="false"
-            android:contentDescription="@string/description_image_button_one"
-        />
-
-        <ImageButton android:id="@+id/two"
-            android:layout_width="88dp"
-            android:layout_height="50dp"
-            android:src="@drawable/dial_num_2"
-            android:background="@drawable/btn_dial"
-            android:soundEffectsEnabled="false"
-            android:contentDescription="@string/description_image_button_two"
-        />
-
-        <ImageButton android:id="@+id/three"
-            android:layout_width="88dp"
-            android:layout_height="50dp"
-            android:src="@drawable/dial_num_3"
-            android:background="@drawable/btn_dial"
-            android:soundEffectsEnabled="false"
-            android:contentDescription="@string/description_image_button_three"
-        />
-
-        <ImageButton android:id="@+id/four"
-            android:layout_width="88dp"
-            android:layout_height="50dp"
-            android:src="@drawable/dial_num_4"
-            android:background="@drawable/btn_dial"
-            android:soundEffectsEnabled="false"
-            android:contentDescription="@string/description_image_button_four"
-        />
-
-        <ImageButton android:id="@+id/five"
-            android:layout_width="88dp"
-            android:layout_height="50dp"
-            android:src="@drawable/dial_num_5"
-            android:background="@drawable/btn_dial"
-            android:soundEffectsEnabled="false"
-            android:contentDescription="@string/description_image_button_five"
-        />
-
-        <ImageButton android:id="@+id/six"
-            android:layout_width="88dp"
-            android:layout_height="50dp"
-            android:src="@drawable/dial_num_6"
-            android:background="@drawable/btn_dial"
-            android:soundEffectsEnabled="false"
-            android:contentDescription="@string/description_image_button_six"
-        />
-
-        <ImageButton android:id="@+id/seven"
-            android:layout_width="88dp"
-            android:layout_height="50dp"
-            android:src="@drawable/dial_num_7"
-            android:background="@drawable/btn_dial"
-            android:soundEffectsEnabled="false"
-            android:contentDescription="@string/description_image_button_seven"
-        />
-
-        <ImageButton android:id="@+id/eight"
-            android:layout_width="88dp"
-            android:layout_height="50dp"
-            android:src="@drawable/dial_num_8"
-            android:background="@drawable/btn_dial"
-            android:soundEffectsEnabled="false"
-            android:contentDescription="@string/description_image_button_eight"
-        />
-
-        <ImageButton android:id="@+id/nine"
-            android:layout_width="88dp"
-            android:layout_height="50dp"
-            android:src="@drawable/dial_num_9"
-            android:background="@drawable/btn_dial"
-            android:soundEffectsEnabled="false"
-            android:contentDescription="@string/description_image_button_nine"
-        />
-
-        <ImageButton android:id="@+id/star"
-            android:layout_width="88dp"
-            android:layout_height="50dp"
-            android:src="@drawable/dial_num_star"
-            android:background="@drawable/btn_dial"
-            android:soundEffectsEnabled="false"
-            android:contentDescription="@string/description_image_button_star"
-        />
-
-        <ImageButton android:id="@+id/zero"
-            android:layout_width="88dp"
-            android:layout_height="50dp"
-            android:src="@drawable/dial_num_0"
-            android:background="@drawable/btn_dial"
-            android:soundEffectsEnabled="false"
-            android:contentDescription="@string/description_image_button_zero"
-        />
-
-        <ImageButton android:id="@+id/pound"
-            android:layout_width="88dp"
-            android:layout_height="50dp"
-            android:src="@drawable/dial_num_pound"
-            android:background="@drawable/btn_dial"
-            android:soundEffectsEnabled="false"
-            android:contentDescription="@string/description_image_button_pound"
-        />
-</com.android.phone.ButtonGridLayout>
diff --git a/overlay/ldpi/packages/apps/Contacts/res/layout-finger/twelve_key_dialer.xml b/overlay/ldpi/packages/apps/Contacts/res/layout-finger/twelve_key_dialer.xml
deleted file mode 100644
index abf8a95..0000000
--- a/overlay/ldpi/packages/apps/Contacts/res/layout-finger/twelve_key_dialer.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2006 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/top"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:background="@drawable/custom_background_dialer"
->
-
-    <!-- Text field above the keypad where the digits are displayed.
-         It's type is set to NULL (to disable the IME keyboard) in the
-         java code.
-    -->
-    <!-- TODO: Use a textAppearance to control the display of the number -->
-    <EditText android:id="@+id/digits"
-        android:layout_width="match_parent"
-        android:layout_height="62dip"
-        android:gravity="center"
-        android:maxLines="1"
-        android:scrollHorizontally="true"
-        android:textSize="33sp"
-        android:freezesText="true"
-        android:background="@drawable/btn_dial_textfield"
-        android:textColor="@color/dialer_button_text"
-        android:focusableInTouchMode="true"
-        android:editable="true"
-        android:cursorVisible="false"
-        android:layout_weight="0"
-        android:contentDescription="@string/description_digits_edittext"
-    />
-
-    <!-- Keypad section -->
-    <include layout="@layout/dialpad" />
-
-    <!-- Horizontal row of buttons (Voicemail + DialButton + Delete.) -->
-    <include layout="@layout/voicemail_dial_delete" />
-
-    <!-- "Dialpad chooser" UI, shown only when the user brings up the
-         Dialer while a call is already in progress.
-         When this UI is visible, the other Dialer elements
-         (the textfield/button and the dialpad) are hidden. -->
-    <ListView android:id="@+id/dialpadChooser"
-        android:layout_width="match_parent"
-        android:layout_height="1dip"
-        android:layout_weight="1"
-    />
-
-</LinearLayout>
diff --git a/overlay/ldpi/packages/apps/Contacts/res/layout-finger/voicemail_dial_delete.xml b/overlay/ldpi/packages/apps/Contacts/res/layout-finger/voicemail_dial_delete.xml
deleted file mode 100644
index dcb803d..0000000
--- a/overlay/ldpi/packages/apps/Contacts/res/layout-finger/voicemail_dial_delete.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Horizontal row of buttons (Voicemail + DialButton + Delete.) -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/voicemailAndDialAndDelete"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_gravity="center_horizontal"
-    android:layout_marginTop="4dip"
-    android:layout_weight="1"
-    android:orientation="horizontal">
-
-    <!-- Onscreen "Voicemail" button.
-         The width is 75 (from the mocks) + 12 of padding from the
-         9patch, total is 87.
-    -->
-    <ImageButton android:id="@+id/voicemailButton"
-        android:layout_width="87dip"
-        android:layout_height="50dip"
-        android:layout_gravity="center_vertical"
-        android:state_enabled="false"
-        android:background="@drawable/btn_dial_voicemail"
-        android:contentDescription="@string/description_voicemail_button"
-        android:src="@drawable/ic_dial_action_voice_mail" />
-
-    <!-- Onscreen "Dial" button, used on all platforms by
-         default. Its usage can be disabled using resources (see
-         config.xml.) -->
-    <ImageButton android:id="@+id/dialButton"
-        android:layout_width="116dip"
-        android:layout_height="50dip"
-        android:layout_gravity="center_vertical"
-        android:state_enabled="false"
-        android:background="@drawable/btn_dial_action"
-        android:contentDescription="@string/description_dial_button"
-        android:src="@drawable/ic_dial_action_call" />
-
-    <!-- Onscreen "Backspace/Delete" button
-         The width is 75 (from the mocks) + 12 of padding from the
-         9patch, total is 87.
-    -->
-    <ImageButton android:id="@+id/deleteButton"
-        android:layout_width="87dip"
-        android:layout_height="50dip"
-        android:layout_gravity="center_vertical"
-        android:state_enabled="false"
-        android:background="@drawable/btn_dial_delete"
-        android:contentDescription="@string/description_delete_button"
-        android:src="@drawable/ic_dial_action_delete" />
-</LinearLayout>
-
diff --git a/overlay/ldpi/packages/apps/DeskClock/res/layout-land/desk_clock.xml b/overlay/ldpi/packages/apps/DeskClock/res/layout-land/desk_clock.xml
deleted file mode 100644
index f03ad42..0000000
--- a/overlay/ldpi/packages/apps/DeskClock/res/layout-land/desk_clock.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- This is the alarm clock in LANDSCAPE desk dock mode.
-     -->
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    >
-    <LinearLayout
-        android:id="@+id/desk_clock"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical"
-        android:paddingTop="25dip"
-        >
-
-        <!-- Entire display region (everything but bottom buttons) -->
-        <!-- Left margin is 4 dip shy of desired to allow for the time to
-             "hang off" the left-hand side, accommodating the extra glyph
-             escapement in Clockopia and 3px of text shadow -->
-        <LinearLayout
-            android:orientation="vertical"
-            android:layout_gravity="left"
-            android:layout_weight="1"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_marginLeft="25dip"
-            android:layout_marginTop="8dip"
-            android:layout_marginRight="18dip"
-            android:layout_marginBottom="4dip"
-            >
-
-            <!-- across the top: next alarm, battery, nightmode button -->
-            <LinearLayout
-                android:orientation="horizontal"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="0"
-                android:layout_marginBottom="6dip"
-                android:layout_marginLeft="4dip"
-                android:gravity="center_vertical"
-                >
-                <TextView android:id="@+id/nextAlarm"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:gravity="left"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:drawablePadding="6dip"
-                    android:drawableLeft="@drawable/ic_lock_idle_alarm"
-                    android:shadowColor="#C0000000"
-                    android:shadowDx="0"
-                    android:shadowDy="0"
-                    android:shadowRadius="3.0"
-                    />
-
-                <include layout="@layout/desk_clock_battery"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginRight="8dip"
-                    android:layout_weight="0"
-                    />
-
-                <ImageButton android:id="@+id/nightmode_button"
-                    style="@style/RoundTouchButton"
-                    android:layout_weight="0"
-                    android:layout_height="wrap_content"
-                    android:layout_width="wrap_content"
-                    android:src="@drawable/ic_round_brightness"
-                    android:contentDescription="@string/nightmode_button_description"
-                    android:nextFocusDown="@+id/alarm_button"
-                    />
-            </LinearLayout>
-
-            <!-- second row: date/time on the left, weather on the right -->
-            <LinearLayout
-                android:orientation="horizontal"
-                android:layout_weight="1"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:gravity="bottom"
-                >
-
-                <include layout="@layout/desk_clock_time_date"
-                    android:layout_height="wrap_content"
-                    android:layout_width="0dip"
-                    android:layout_weight="5"
-                    />
-
-                <include layout="@layout/desk_clock_weather"
-                    android:layout_height="wrap_content"
-                    android:layout_width="0dip"
-                    android:layout_marginLeft="2dip"
-                    android:layout_weight="5"
-                    />
-
-
-            </LinearLayout>
-
-        </LinearLayout>
-
-        <include layout="@layout/desk_clock_buttons" />
-
-    </LinearLayout>
-
-    <View android:id="@+id/window_tint"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="#CC000000"
-        android:visibility="visible"
-        android:clickable="false"
-        />
-
-</FrameLayout>
diff --git a/overlay/ldpi/packages/apps/DeskClock/res/layout/desk_clock.xml b/overlay/ldpi/packages/apps/DeskClock/res/layout/desk_clock.xml
deleted file mode 100644
index c16b0c6..0000000
--- a/overlay/ldpi/packages/apps/DeskClock/res/layout/desk_clock.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- This is the alarm clock in desk dock mode. It shows the time in large
-     type, plus information about active alarms and charge status.  It can
-     also show some additional status information (e.g. weather data).
-     Buttons are provided to access alarms, music, and other useful functions.
-     -->
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    >
-    <!-- the top padding accounts for the status bar area -->
-    <LinearLayout
-        android:id="@+id/desk_clock"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical"
-        android:paddingTop="25dip"
-        >
-
-        <!-- Entire display region (everything but bottom buttons) -->
-        <!-- Left margin is 4 dip shy of desired to allow for the time to
-             "hang off" the left-hand side, accommodating the extra glyph
-             escapement in Clockopia and 3px of text shadow -->
-        <LinearLayout
-            android:orientation="vertical"
-            android:layout_gravity="left"
-            android:layout_weight="1"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_marginLeft="22dip"
-            android:layout_marginTop="8dip"
-            android:layout_marginRight="18dip"
-            android:layout_marginBottom="4dip"
-            >
-
-            <!-- across the top: next alarm, nightmode button -->
-            <LinearLayout
-                android:orientation="horizontal"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="0"
-                android:layout_marginLeft="4dip"
-                android:layout_marginBottom="6dip"
-                android:gravity="center_vertical"
-                >
-                <TextView android:id="@+id/nextAlarm"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:gravity="left"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:drawablePadding="6dip"
-                    android:drawableLeft="@drawable/ic_lock_idle_alarm"
-                    android:shadowColor="#C0000000"
-                    android:shadowDx="0"
-                    android:shadowDy="0"
-                    android:shadowRadius="3.0"
-                    />
-                <ImageButton android:id="@+id/nightmode_button"
-                    style="@style/RoundTouchButton"
-                    android:layout_weight="0"
-                    android:layout_height="wrap_content"
-                    android:layout_width="wrap_content"
-                    android:src="@drawable/ic_round_brightness"
-                    android:contentDescription="@string/nightmode_button_description"
-                    android:nextFocusDown="@+id/alarm_button"
-                    />
-            </LinearLayout>
-
-            <include layout="@layout/desk_clock_time_date"
-                android:layout_weight="1"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                />
-
-            <include layout="@layout/desk_clock_weather"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="0"
-                android:layout_marginTop="2dip"
-                android:layout_marginBottom="20dip"
-                android:layout_marginLeft="4dip"
-                />
-
-            <include layout="@layout/desk_clock_battery"
-                android:layout_height="wrap_content"
-                android:layout_width="match_parent"
-                android:layout_weight="0"
-                android:layout_marginLeft="4dip"
-                />
-
-        </LinearLayout>
-
-        <include layout="@layout/desk_clock_buttons" />
-
-    </LinearLayout>
-
-    <View android:id="@+id/window_tint"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="#CC000000"
-        android:visibility="visible"
-        android:clickable="false"
-        />
-
-</FrameLayout>
diff --git a/overlay/ldpi/packages/apps/DeskClock/res/layout/desk_clock_time_date.xml b/overlay/ldpi/packages/apps/DeskClock/res/layout/desk_clock_time_date.xml
deleted file mode 100644
index 761ddfe..0000000
--- a/overlay/ldpi/packages/apps/DeskClock/res/layout/desk_clock_time_date.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- digital clock & date, together -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/time_date"
-    android:orientation="vertical"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:gravity="left|center_vertical"
-    android:layout_weight="1"
-    >
-
-    <com.android.deskclock.DigitalClock android:id="@+id/time"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="2dip"
-        >
-
-        <TextView android:id="@+id/timeDisplay"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:singleLine="true"
-            android:ellipsize="none"
-            android:gravity="center"
-            android:textSize="76sp"
-            android:textColor="#FFFFFFFF"
-            android:shadowColor="#C0000000"
-            android:shadowDx="0"
-            android:shadowDy="0"
-            android:shadowRadius="3.0"
-            android:paddingBottom="3dip"
-            />
-
-
-        <TextView android:id="@+id/am_pm"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:gravity="bottom"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:textStyle="bold"
-            android:singleLine="true"
-            android:ellipsize="none"
-            android:layout_marginLeft="4dip"
-            android:shadowColor="#C0000000"
-            android:shadowDx="0"
-            android:shadowDy="0"
-            android:shadowRadius="3.0"
-            />
-
-    </com.android.deskclock.DigitalClock>
-
-    <TextView android:id="@+id/date"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:gravity="left"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:shadowColor="#C0000000"
-        android:shadowDx="0"
-        android:shadowDy="0"
-        android:shadowRadius="3.0"
-        android:layout_marginLeft="4dip"
-        />
-
-</LinearLayout>
diff --git a/overlay/ldpi/packages/apps/Email/res/drawable-ldpi/stat_notify_email_generic.png b/overlay/ldpi/packages/apps/Email/res/drawable-ldpi/stat_notify_email_generic.png
deleted file mode 100644
index a49802a..0000000
--- a/overlay/ldpi/packages/apps/Email/res/drawable-ldpi/stat_notify_email_generic.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/FM/res/layout/fm_top.xml b/overlay/ldpi/packages/apps/FM/res/layout/fm_top.xml
deleted file mode 100644
index 08f4207..0000000
--- a/overlay/ldpi/packages/apps/FM/res/layout/fm_top.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<View
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="0dp"
-	android:layout_height="0dp" />
diff --git a/overlay/ldpi/packages/apps/Launcher2/res/layout/all_apps.xml b/overlay/ldpi/packages/apps/Launcher2/res/layout/all_apps.xml
deleted file mode 100644
index daf1b6f..0000000
--- a/overlay/ldpi/packages/apps/Launcher2/res/layout/all_apps.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- switch to all_apps_3d on devices that support RenderScript -->
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
-    <include layout="@layout/all_apps_3d" />
-</merge>
diff --git a/overlay/ldpi/packages/apps/Launcher2/res/values/strings.xml b/overlay/ldpi/packages/apps/Launcher2/res/values/strings.xml
deleted file mode 100644
index 5c9850a..0000000
--- a/overlay/ldpi/packages/apps/Launcher2/res/values/strings.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-* Copyright (C) 2010 The Android Open Source Project
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*      http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
--->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- Make launcher run in acore. -->
-    <string name="sharedUserId" translate="false"><xliff:g id="x">android.uid.shared</xliff:g></string>
-    <string name="process" translate="false"><xliff:g id="x">android.process.acore</xliff:g></string>
-</resources>
diff --git a/overlay/ldpi/packages/apps/Music/res/drawable-ldpi-finger/album_border_large.9.png b/overlay/ldpi/packages/apps/Music/res/drawable-ldpi-finger/album_border_large.9.png
deleted file mode 100644
index 03520f2..0000000
--- a/overlay/ldpi/packages/apps/Music/res/drawable-ldpi-finger/album_border_large.9.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/Music/res/drawable-ldpi-finger/albumart_mp_unknown.png b/overlay/ldpi/packages/apps/Music/res/drawable-ldpi-finger/albumart_mp_unknown.png
deleted file mode 100644
index 4cf134a..0000000
--- a/overlay/ldpi/packages/apps/Music/res/drawable-ldpi-finger/albumart_mp_unknown.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/Music/res/drawable-ldpi-finger/albumart_mp_unknown_list.png b/overlay/ldpi/packages/apps/Music/res/drawable-ldpi-finger/albumart_mp_unknown_list.png
deleted file mode 100644
index f90bfda..0000000
--- a/overlay/ldpi/packages/apps/Music/res/drawable-ldpi-finger/albumart_mp_unknown_list.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/Music/res/drawable-ldpi-finger/btn_playback_ic_next.png b/overlay/ldpi/packages/apps/Music/res/drawable-ldpi-finger/btn_playback_ic_next.png
deleted file mode 100644
index 6c0a8d8..0000000
--- a/overlay/ldpi/packages/apps/Music/res/drawable-ldpi-finger/btn_playback_ic_next.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/Music/res/drawable-ldpi-finger/btn_playback_ic_pause.png b/overlay/ldpi/packages/apps/Music/res/drawable-ldpi-finger/btn_playback_ic_pause.png
deleted file mode 100644
index 7781e0d..0000000
--- a/overlay/ldpi/packages/apps/Music/res/drawable-ldpi-finger/btn_playback_ic_pause.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/Music/res/drawable-ldpi-finger/btn_playback_ic_play.png b/overlay/ldpi/packages/apps/Music/res/drawable-ldpi-finger/btn_playback_ic_play.png
deleted file mode 100644
index 6299a69..0000000
--- a/overlay/ldpi/packages/apps/Music/res/drawable-ldpi-finger/btn_playback_ic_play.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/Music/res/drawable-ldpi-finger/btn_playback_ic_prev.png b/overlay/ldpi/packages/apps/Music/res/drawable-ldpi-finger/btn_playback_ic_prev.png
deleted file mode 100644
index 1c96e1b..0000000
--- a/overlay/ldpi/packages/apps/Music/res/drawable-ldpi-finger/btn_playback_ic_prev.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/Music/res/drawable-ldpi-finger/music_bottom_playback_bg.9.png b/overlay/ldpi/packages/apps/Music/res/drawable-ldpi-finger/music_bottom_playback_bg.9.png
deleted file mode 100644
index 514a250..0000000
--- a/overlay/ldpi/packages/apps/Music/res/drawable-ldpi-finger/music_bottom_playback_bg.9.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/Music/res/drawable-ldpi-finger/stat_notify_musicplayer.png b/overlay/ldpi/packages/apps/Music/res/drawable-ldpi-finger/stat_notify_musicplayer.png
deleted file mode 100644
index e0a6fcf..0000000
--- a/overlay/ldpi/packages/apps/Music/res/drawable-ldpi-finger/stat_notify_musicplayer.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/Music/res/drawable-mdpi-finger/buttonbar_active.9.png b/overlay/ldpi/packages/apps/Music/res/drawable-mdpi-finger/buttonbar_active.9.png
deleted file mode 100644
index 5028318..0000000
--- a/overlay/ldpi/packages/apps/Music/res/drawable-mdpi-finger/buttonbar_active.9.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/Music/res/drawable-mdpi-finger/buttonbar_focused.9.png b/overlay/ldpi/packages/apps/Music/res/drawable-mdpi-finger/buttonbar_focused.9.png
deleted file mode 100644
index f874825..0000000
--- a/overlay/ldpi/packages/apps/Music/res/drawable-mdpi-finger/buttonbar_focused.9.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/Music/res/drawable-mdpi-finger/buttonbar_pressed.9.png b/overlay/ldpi/packages/apps/Music/res/drawable-mdpi-finger/buttonbar_pressed.9.png
deleted file mode 100644
index 237571e..0000000
--- a/overlay/ldpi/packages/apps/Music/res/drawable-mdpi-finger/buttonbar_pressed.9.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/Music/res/layout-finger/audio_player_common_controls.xml b/overlay/ldpi/packages/apps/Music/res/layout-finger/audio_player_common_controls.xml
deleted file mode 100644
index 1ca0a98..0000000
--- a/overlay/ldpi/packages/apps/Music/res/layout-finger/audio_player_common_controls.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <ImageButton android:id="@+id/pause"
-        android:layout_width="116dip"
-        android:layout_height="54dip"
-        android:background="@drawable/btn_playback_middle"
-        android:src="@drawable/btn_playback_ic_play"
-        android:layout_above="@android:id/progress"
-        android:layout_centerHorizontal="true"
-        android:layout_marginBottom="6dip" />
-
-    <com.android.music.RepeatingImageButton android:id="@+id/prev"
-        android:layout_width="56dip"
-        android:layout_height="54dip"
-        android:background="@drawable/btn_playback_left"
-        android:src="@drawable/btn_playback_ic_prev"
-        android:layout_above="@android:id/progress"
-        android:layout_toLeftOf="@id/pause"
-        android:layout_marginBottom="6dip" />
-
-    <com.android.music.RepeatingImageButton android:id="@+id/next"
-        android:layout_width="56dip"
-        android:layout_height="54dip"
-        android:background="@drawable/btn_playback_right"
-        android:src="@drawable/btn_playback_ic_next"
-        android:layout_above="@android:id/progress"
-        android:layout_toRightOf="@id/pause"
-        android:layout_marginBottom="6dip" />
-
-</merge>
diff --git a/overlay/ldpi/packages/apps/Music/res/layout-land-finger/audio_player_common_controls.xml b/overlay/ldpi/packages/apps/Music/res/layout-land-finger/audio_player_common_controls.xml
deleted file mode 100644
index 54b410b..0000000
--- a/overlay/ldpi/packages/apps/Music/res/layout-land-finger/audio_player_common_controls.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <ImageButton android:id="@+id/pause"
-        android:layout_width="116dip"
-        android:layout_height="54dip"
-        android:background="@drawable/btn_playback_middle"
-        android:src="@drawable/btn_playback_ic_play"
-        android:layout_alignParentBottom="true"
-        android:layout_centerHorizontal="true"
-        android:layout_marginBottom="6dip" />
-
-    <com.android.music.RepeatingImageButton android:id="@+id/prev"
-        android:layout_width="56dip"
-        android:layout_height="54dip"
-        android:background="@drawable/btn_playback_left"
-        android:src="@drawable/btn_playback_ic_prev"
-        android:layout_toLeftOf="@id/pause"
-        android:layout_alignParentBottom="true"
-        android:layout_marginBottom="6dip" />
-
-    <com.android.music.RepeatingImageButton android:id="@+id/next"
-        android:layout_width="56dip"
-        android:layout_height="54dip"
-        android:background="@drawable/btn_playback_right"
-        android:src="@drawable/btn_playback_ic_next"
-        android:layout_toRightOf="@id/pause"
-        android:layout_alignParentBottom="true"
-        android:layout_marginBottom="6dip" />
-
-</merge>
diff --git a/overlay/ldpi/packages/apps/Music/res/layout-land-mdpi-finger/audio_player.xml b/overlay/ldpi/packages/apps/Music/res/layout-land-mdpi-finger/audio_player.xml
deleted file mode 100644
index bc3cb6b..0000000
--- a/overlay/ldpi/packages/apps/Music/res/layout-land-mdpi-finger/audio_player.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@drawable/audio_player_background">
-
-    <ImageView
-        android:id="@+id/album"
-        android:background="@drawable/album_border_large"
-        android:layout_width="180dip"
-        android:layout_height="180dip"
-        android:layout_marginLeft="8dip"
-        android:layout_marginRight="0dip"
-        android:layout_marginTop="8dip" />
-
-    <RelativeLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_toRightOf="@id/album"
-        android:layout_alignTop="@id/album"
-        android:layout_alignBottom="@id/album"
-        android:layout_alignParentRight="true">
-
-        <ImageButton android:id="@+id/repeat"
-            android:layout_width="48dip"
-            android:layout_height="36dip"
-            android:layout_alignParentLeft="true"
-            android:layout_marginLeft="2dip"
-            android:background="@drawable/btn_playback_top" />
-
-        <ImageButton android:id="@+id/shuffle"
-            android:layout_width="48dip"
-            android:layout_height="36dip"
-            android:layout_alignParentRight="true"
-            android:layout_marginRight="4dip"
-            android:background="@drawable/btn_playback_top" />
-
-        <TextView android:id="@+id/nowplaying_title"
-            android:textSize="20sp"
-            android:textColor="#ffffffff"
-            android:shadowColor="#ff000000"
-            android:shadowDx="0"
-            android:shadowDy="0"
-            android:shadowRadius="3"
-            android:singleLine="true"
-            android:ellipsize="end"
-            android:layout_width="wrap_content"
-            android:layout_height="36dip"
-            android:layout_centerHorizontal="true"
-            android:padding="4dip"
-            android:gravity="center_vertical"
-            android:text="@string/nowplaying_title" />
-
-        <TextView android:id="@+id/artistname"
-            android:textSize="18sp"
-            android:singleLine="true"
-            android:ellipsize="end"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/nowplaying_title"
-            android:layout_marginTop="6dip"
-            android:layout_centerHorizontal="true"
-            android:padding="2dip" />
-
-        <TextView android:id="@+id/albumname"
-            android:textSize="14sp"
-            android:singleLine="true"
-            android:ellipsize="end"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/artistname"
-            android:layout_centerHorizontal="true"
-            android:padding="0dip" />
-
-        <TextView android:id="@+id/trackname"
-            android:textSize="14sp"
-            android:singleLine="true"
-            android:ellipsize="end"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/albumname"
-            android:layout_centerHorizontal="true"
-            android:padding="0dip" />
-
-        <include layout="@layout/audio_player_common_controls" />
-
-    </RelativeLayout>
-
-    <include layout="@layout/audio_player_common_progress" />
-
-</RelativeLayout>
diff --git a/overlay/ldpi/packages/apps/Music/res/layout-mdpi-finger/audio_player.xml b/overlay/ldpi/packages/apps/Music/res/layout-mdpi-finger/audio_player.xml
deleted file mode 100644
index b69a609..0000000
--- a/overlay/ldpi/packages/apps/Music/res/layout-mdpi-finger/audio_player.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/audio_player"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@drawable/audio_player_background"
-    android:paddingTop="2dip">
-
-    <ImageButton android:id="@+id/repeat"
-        android:layout_width="48dip"
-        android:layout_height="36dip"
-        android:layout_alignParentLeft = "true"
-        android:layout_marginLeft="4dip"
-        android:background="@drawable/btn_playback_top" />
-
-    <ImageButton android:id="@+id/shuffle"
-        android:layout_width="48dip"
-        android:layout_height="36dip"
-        android:layout_alignParentRight = "true"
-        android:layout_marginRight="4dip"
-        android:background="@drawable/btn_playback_top" />
-
-    <TextView android:id="@+id/nowplaying_title"
-        android:textSize="20sp"
-        android:textColor="#ffffffff"
-        android:shadowColor="#ff000000"
-        android:shadowDx="0"
-        android:shadowDy="0"
-        android:shadowRadius="3"
-        android:singleLine="true"
-        android:layout_width="wrap_content"
-        android:layout_height="36dip"
-        android:layout_centerHorizontal="true"
-        android:padding="2dip"
-        android:gravity="center_vertical"
-        android:text="@string/nowplaying_title" />
-
-    <ImageView android:id="@+id/album"
-        android:background="@drawable/album_border_large"
-        android:layout_width="180dip"
-        android:layout_height="180dip"
-        android:layout_centerHorizontal="true"
-        android:layout_below="@id/nowplaying_title"
-        android:layout_marginTop="2dip" />
-
-    <TextView android:id="@+id/artistname"
-        android:textSize="18sp"
-        android:singleLine="true"
-        android:ellipsize="end"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/album"
-        android:layout_centerHorizontal="true"
-        android:padding="2dip" />
-
-    <TextView android:id="@+id/albumname"
-        android:textSize="14sp"
-        android:singleLine="true"
-        android:ellipsize="end"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/artistname"
-        android:layout_centerHorizontal="true"
-        android:padding="0dip" />
-
-    <TextView android:id="@+id/trackname"
-        android:textSize="14sp"
-        android:singleLine="true"
-        android:ellipsize="end"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/albumname"
-        android:layout_centerHorizontal="true"
-        android:padding="0dip" />
-
-    <include layout="@layout/audio_player_common_progress" />
-
-    <include layout="@layout/audio_player_common_controls" />
-
-</RelativeLayout>
diff --git a/overlay/ldpi/packages/apps/PackageInstaller/res/drawable-ldpi/title_bar_medium.9.png b/overlay/ldpi/packages/apps/PackageInstaller/res/drawable-ldpi/title_bar_medium.9.png
deleted file mode 100644
index 39e692d..0000000
--- a/overlay/ldpi/packages/apps/PackageInstaller/res/drawable-ldpi/title_bar_medium.9.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/Phone/res/drawable-ldpi/bg_in_call_gradient_bluetooth.9.png b/overlay/ldpi/packages/apps/Phone/res/drawable-ldpi/bg_in_call_gradient_bluetooth.9.png
deleted file mode 100644
index 369c82c..0000000
--- a/overlay/ldpi/packages/apps/Phone/res/drawable-ldpi/bg_in_call_gradient_bluetooth.9.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/Phone/res/drawable-ldpi/bg_in_call_gradient_connected.9.png b/overlay/ldpi/packages/apps/Phone/res/drawable-ldpi/bg_in_call_gradient_connected.9.png
deleted file mode 100644
index 13a97fc..0000000
--- a/overlay/ldpi/packages/apps/Phone/res/drawable-ldpi/bg_in_call_gradient_connected.9.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/Phone/res/drawable-ldpi/bg_in_call_gradient_ended.9.png b/overlay/ldpi/packages/apps/Phone/res/drawable-ldpi/bg_in_call_gradient_ended.9.png
deleted file mode 100644
index ee93c83..0000000
--- a/overlay/ldpi/packages/apps/Phone/res/drawable-ldpi/bg_in_call_gradient_ended.9.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/Phone/res/drawable-ldpi/bg_in_call_gradient_on_hold.9.png b/overlay/ldpi/packages/apps/Phone/res/drawable-ldpi/bg_in_call_gradient_on_hold.9.png
deleted file mode 100644
index 4d8e2c3..0000000
--- a/overlay/ldpi/packages/apps/Phone/res/drawable-ldpi/bg_in_call_gradient_on_hold.9.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/Phone/res/drawable-ldpi/bg_in_call_gradient_unidentified.9.png b/overlay/ldpi/packages/apps/Phone/res/drawable-ldpi/bg_in_call_gradient_unidentified.9.png
deleted file mode 100644
index be989d5..0000000
--- a/overlay/ldpi/packages/apps/Phone/res/drawable-ldpi/bg_in_call_gradient_unidentified.9.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/Phone/res/layout-finger/dialpad.xml b/overlay/ldpi/packages/apps/Phone/res/layout-finger/dialpad.xml
deleted file mode 100644
index 804fe71..0000000
--- a/overlay/ldpi/packages/apps/Phone/res/layout-finger/dialpad.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2006 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<com.android.phone.ButtonGridLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/dialpad"
-    android:paddingLeft="7dp"
-    android:paddingRight="7dp"
-    android:paddingTop="2dp"
-    android:paddingBottom="1dp"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_gravity="center_horizontal"
-    android:layout_weight="1"
->
-        <ImageButton android:id="@+id/one"
-            android:layout_width="88dp"
-            android:layout_height="50dp"
-            android:src="@drawable/dial_num_1_no_vm"
-            android:background="@drawable/btn_dial"
-        />
-
-        <ImageButton android:id="@+id/two"
-            android:layout_width="88dp"
-            android:layout_height="50dp"
-            android:src="@drawable/dial_num_2"
-            android:background="@drawable/btn_dial"
-        />
-
-        <ImageButton android:id="@+id/three"
-            android:layout_width="88dp"
-            android:layout_height="50dp"
-            android:src="@drawable/dial_num_3"
-            android:background="@drawable/btn_dial"
-        />
-
-        <ImageButton android:id="@+id/four"
-            android:layout_width="88dp"
-            android:layout_height="50dp"
-            android:src="@drawable/dial_num_4"
-            android:background="@drawable/btn_dial"
-        />
-
-        <ImageButton android:id="@+id/five"
-            android:layout_width="88dp"
-            android:layout_height="50dp"
-            android:src="@drawable/dial_num_5"
-            android:background="@drawable/btn_dial"
-        />
-
-        <ImageButton android:id="@+id/six"
-            android:layout_width="88dp"
-            android:layout_height="50dp"
-            android:src="@drawable/dial_num_6"
-            android:background="@drawable/btn_dial"
-        />
-
-        <ImageButton android:id="@+id/seven"
-            android:layout_width="88dp"
-            android:layout_height="50dp"
-            android:src="@drawable/dial_num_7"
-            android:background="@drawable/btn_dial"
-        />
-
-        <ImageButton android:id="@+id/eight"
-            android:layout_width="88dp"
-            android:layout_height="50dp"
-            android:src="@drawable/dial_num_8"
-            android:background="@drawable/btn_dial"
-        />
-
-        <ImageButton android:id="@+id/nine"
-            android:layout_width="88dp"
-            android:layout_height="50dp"
-            android:src="@drawable/dial_num_9"
-            android:background="@drawable/btn_dial"
-        />
-
-        <ImageButton android:id="@+id/star"
-            android:layout_width="88dp"
-            android:layout_height="50dp"
-            android:src="@drawable/dial_num_star"
-            android:background="@drawable/btn_dial"
-        />
-
-        <ImageButton android:id="@+id/zero"
-            android:layout_width="88dp"
-            android:layout_height="50dp"
-            android:src="@drawable/dial_num_0"
-            android:background="@drawable/btn_dial"
-        />
-
-        <ImageButton android:id="@+id/pound"
-            android:layout_width="88dp"
-            android:layout_height="50dp"
-            android:src="@drawable/dial_num_pound"
-            android:background="@drawable/btn_dial"
-        />
-</com.android.phone.ButtonGridLayout>
-
diff --git a/overlay/ldpi/packages/apps/Phone/res/layout-finger/dtmf_twelve_key_dialer.xml b/overlay/ldpi/packages/apps/Phone/res/layout-finger/dtmf_twelve_key_dialer.xml
deleted file mode 100644
index d87274a..0000000
--- a/overlay/ldpi/packages/apps/Phone/res/layout-finger/dtmf_twelve_key_dialer.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Sliding drawer widget containing the in-call DTMF dialpad.
-
-     On devices that do *not* use an onscreen InCallTouchUi
-     widget, the dialpad is contained within a SlidingDrawer
-     (which provides a "handle" that the user must drag open
-     to access the dialpad.)
-
-     See non_drawer_dialpad.xml for the corresponding layout file
-     for devices that *do* use an InCallTouchUi widget.
-     -->
-<SlidingDrawer
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/dialer_container"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:topOffset="5dp"
-    android:bottomOffset="7dp"
-    android:handle="@+id/dialer_tab"
-    android:content="@+id/dtmf_dialer"
-    android:allowSingleTap="false"
-    android:visibility="gone"
-    >
-
-    <!-- Drawer handle -->
-    <LinearLayout
-        android:id="@id/dialer_tab"
-        android:orientation="horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="bottom"
-        android:focusable="true"
-        >
-        <ImageView
-            android:layout_width="1dip"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:scaleType="fitXY"
-            android:duplicateParentState="true"
-            android:src="@drawable/tray_handle_strip"
-            />
-        <Button
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/dtmfDialpadHandleLabel"
-            android:singleLine="true"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:textStyle="bold"
-            android:shadowDy="1"
-            android:shadowRadius="0.9"
-            android:shadowColor="#ffffffff"
-            android:duplicateParentState="true"
-            android:background="@drawable/tray_handle_tab"/>
-        <ImageView
-            android:layout_width="1dip"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:scaleType="fitXY"
-            android:src="@drawable/tray_handle_strip"
-            android:duplicateParentState="true"
-            />
-    </LinearLayout>
-
-    <!-- drawer content dialer view -->
-    <com.android.phone.DTMFTwelveKeyDialerView
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/dtmf_dialer"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical"
-        android:layout_marginTop="1dip"
-        android:background="@color/dtmf_dialer_background">
-
-        <!-- Number Display Field, padded for correct text alignment -->
-        <EditText android:id="@+id/dtmfDialerField"
-            android:layout_width="match_parent"
-            android:layout_height="62dp"
-            android:layout_marginTop="14dp"
-            android:layout_marginBottom="6dp"
-            android:layout_marginLeft="3dp"
-            android:layout_marginRight="3dp"
-            android:paddingRight="16dp"
-            android:paddingLeft="16dp"
-            android:maxLines="1"
-            android:scrollHorizontally="true"
-            android:textSize="28sp"
-            android:freezesText="true"
-            android:background="@drawable/btn_dial_textfield_normal_full"
-            android:textColor="@color/dtmf_dialer_display_text"
-            android:focusableInTouchMode="false"
-            android:clickable="false"/>
-
-        <!-- Keypad section -->
-        <include layout="@layout/dialpad" />
-
-        <!-- Dummy element to pad below the dialpad -->
-        <View android:layout_height="1dp"
-            android:layout_width="match_parent"
-            android:layout_weight="1"/>
-
-    </com.android.phone.DTMFTwelveKeyDialerView>
-
-</SlidingDrawer>
diff --git a/overlay/ldpi/packages/apps/Phone/res/layout-finger/emergency_dialer.xml b/overlay/ldpi/packages/apps/Phone/res/layout-finger/emergency_dialer.xml
deleted file mode 100644
index 3a4c5cc..0000000
--- a/overlay/ldpi/packages/apps/Phone/res/layout-finger/emergency_dialer.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2006 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/top"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
->
-
-    <!-- Text field above the keypad where the digits are displayed -->
-    <!-- TODO: Use a textAppearance to control the display of the number -->
-    <EditText android:id="@+id/digits"
-        android:layout_width="match_parent"
-        android:layout_height="60dip"
-        android:gravity="center"
-        android:maxLines="1"
-        android:scrollHorizontally="true"
-        android:textSize="33sp"
-        android:freezesText="true"
-        android:background="@drawable/btn_dial_textfield"
-        android:textColor="@color/dialer_button_text"
-        android:focusableInTouchMode="false"
-        android:layout_weight="0"
-    />
-
-    <!-- Keypad section -->
-    <include layout="@layout/dialpad" />
-
-    <!-- Horizontal row of buttons (Voicemail + DialButton + Delete.) -->
-    <include layout="@layout/voicemail_dial_delete" />
-
-</LinearLayout>
diff --git a/overlay/ldpi/packages/apps/Phone/res/layout-finger/non_drawer_dialpad.xml b/overlay/ldpi/packages/apps/Phone/res/layout-finger/non_drawer_dialpad.xml
deleted file mode 100644
index 7e3d77a..0000000
--- a/overlay/ldpi/packages/apps/Phone/res/layout-finger/non_drawer_dialpad.xml
+++ /dev/null
@@ -1,152 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- New style in-call DTMF dialpad, for devices that use the
-     InCallTouchUi widget, and thus do NOT use a SlidingDrawer
-     to contain the dialpad.
-
-     This provides basically the same UI elements as
-     dtmf_twelve_key_dialer.xml and dialpad.xml, but in a more
-     compact layout, and without the SlidingDrawer container.
-     -->
-<com.android.phone.DTMFTwelveKeyDialerView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/non_drawer_dtmf_dialer"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:layout_marginTop="1dip"
-    android:visibility="gone"
-    >
-
-    <!-- Display of the digits you've typed so far -->
-    <EditText
-        android:id="@+id/dtmfDialerField"
-        android:layout_width="match_parent"
-        android:layout_height="30dp"
-        android:layout_marginTop="8dp"
-        android:layout_marginBottom="5dp"
-        android:layout_marginLeft="32dp"
-        android:layout_marginRight="32dp"
-        android:paddingRight="16dp"
-        android:paddingLeft="16dp"
-        android:maxLines="1"
-        android:scrollHorizontally="true"
-        android:textSize="24sp"
-        android:gravity="center"
-        android:freezesText="true"
-        android:background="@null"
-        android:textColor="@color/dtmf_dialer_display_text"
-        android:focusableInTouchMode="false"
-        android:clickable="false"/>
-
-    <!-- The dialpad itself -->
-    <com.android.phone.ButtonGridLayout
-        android:id="@+id/dialpad"
-        android:paddingLeft="7dp"
-        android:paddingRight="7dp"
-        android:paddingTop="2dp"
-        android:paddingBottom="1dp"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        >
-        <ImageButton android:id="@+id/one"
-                     android:layout_width="88dp"
-                     android:layout_height="50dp"
-                     android:src="@drawable/dial_num_1_no_vm"
-                     android:background="@drawable/btn_dial_green"
-                     />
-
-        <ImageButton android:id="@+id/two"
-                     android:layout_width="88dp"
-                     android:layout_height="50dp"
-                     android:src="@drawable/dial_num_2"
-                     android:background="@drawable/btn_dial_green"
-                     />
-
-        <ImageButton android:id="@+id/three"
-                     android:layout_width="88dp"
-                     android:layout_height="50dp"
-                     android:src="@drawable/dial_num_3"
-                     android:background="@drawable/btn_dial_green"
-                     />
-
-        <ImageButton android:id="@+id/four"
-                     android:layout_width="88dp"
-                     android:layout_height="50dp"
-                     android:src="@drawable/dial_num_4"
-                     android:background="@drawable/btn_dial_green"
-                     />
-
-        <ImageButton android:id="@+id/five"
-                     android:layout_width="88dp"
-                     android:layout_height="50dp"
-                     android:src="@drawable/dial_num_5"
-                     android:background="@drawable/btn_dial_green"
-                     />
-
-        <ImageButton android:id="@+id/six"
-                     android:layout_width="88dp"
-                     android:layout_height="50dp"
-                     android:src="@drawable/dial_num_6"
-                     android:background="@drawable/btn_dial_green"
-                     />
-
-        <ImageButton android:id="@+id/seven"
-                     android:layout_width="88dp"
-                     android:layout_height="50dp"
-                     android:src="@drawable/dial_num_7"
-                     android:background="@drawable/btn_dial_green"
-                     />
-
-        <ImageButton android:id="@+id/eight"
-                     android:layout_width="88dp"
-                     android:layout_height="50dp"
-                     android:src="@drawable/dial_num_8"
-                     android:background="@drawable/btn_dial_green"
-                     />
-
-        <ImageButton android:id="@+id/nine"
-                     android:layout_width="88dp"
-                     android:layout_height="50dp"
-                     android:src="@drawable/dial_num_9"
-                     android:background="@drawable/btn_dial_green"
-                     />
-
-        <ImageButton android:id="@+id/star"
-                     android:layout_width="88dp"
-                     android:layout_height="50dp"
-                     android:src="@drawable/dial_num_star"
-                     android:background="@drawable/btn_dial_green"
-                     />
-
-        <ImageButton android:id="@+id/zero"
-                     android:layout_width="88dp"
-                     android:layout_height="50dp"
-                     android:src="@drawable/dial_num_0"
-                     android:background="@drawable/btn_dial_green"
-                     />
-
-        <ImageButton android:id="@+id/pound"
-                     android:layout_width="88dp"
-                     android:layout_height="50dp"
-                     android:src="@drawable/dial_num_pound"
-                     android:background="@drawable/btn_dial_green"
-                     />
-    </com.android.phone.ButtonGridLayout>
-
-</com.android.phone.DTMFTwelveKeyDialerView>
diff --git a/overlay/ldpi/packages/apps/Phone/res/layout-mdpi/incall_touch_ui.xml b/overlay/ldpi/packages/apps/Phone/res/layout-mdpi/incall_touch_ui.xml
deleted file mode 100644
index fc8bcb4..0000000
--- a/overlay/ldpi/packages/apps/Phone/res/layout-mdpi/incall_touch_ui.xml
+++ /dev/null
@@ -1,243 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- In-call onscreen touch UI elements, used on some platforms.
-
-     This layout is a fullscreen overlay, drawn on top of the
-     non-touch-sensitive parts of the in-call UI (i.e. the call card).
-
-     The top-level View here is a FrameLayout with 2 children:
-       (1) incomingCallWidget: the UI displayed while an incoming call is ringing
-       (2) inCallControls: the widgets visible while a regular call (or calls) is in progress
-     Exactly one of these is visible at any given moment.
-     -->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    >
-
-    <!-- (1) incomingCallWidget: the UI displayed while an incoming call is ringing. -->
-    <com.android.internal.widget.SlidingTab
-        android:id="@+id/incomingSlidingTabCallWidget"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:visibility="gone"
-        android:layout_alignParentBottom="true"
-        android:layout_marginBottom="40dip"
-        />
-
-    <!-- (1) incomingCallWidget: the UI displayed while an incoming call is ringing. -->
-    <com.android.internal.widget.RotarySelector
-        android:id="@+id/incomingRotarySelectorCallWidget"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:visibility="gone"
-        android:layout_alignParentBottom="true"
-        />
-
-    <!-- (1) incomingCallWidget: the UI displayed while an incoming call is ringing. -->
-    <com.android.internal.widget.RingSelector
-        android:id="@+id/incomingRingSelectorCallWidget"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:visibility="gone"
-        android:layout_alignParentBottom="true"
-        />
-
-    <!--
-        (2) inCallControls: the widgets visible while a regular call
-        (or calls) is in progress
-    -->
-    <RelativeLayout android:id="@+id/inCallControls"
-                    android:layout_width="fill_parent"
-                    android:layout_height="fill_parent"
-                    android:layout_alignParentTop="true"
-                    android:visibility="gone"
-                    >
-        <!-- Buttons visible in the upper corners of the screen (in some states). -->
-        <!-- These are small round ImageButtons with a text label floating
-             off to the side. -->
-
-        <!-- "Hold" (upper left) -->
-        <!-- (Note "Hold", "Swap" and "Merge" are never available at
-             the same time.  That's why it's OK for them to be in the
-             same position onscreen.) -->
-        <LinearLayout android:id="@+id/holdButtonContainer"
-                style="@style/InCallRoundButtonContainer"
-                android:layout_alignParentLeft="true"
-                android:layout_marginLeft="10dip"
-                android:visibility="gone">
-            <ImageButton android:id="@+id/holdButton"
-                    style="@style/InCallRoundTouchButton"
-                    android:src="@drawable/ic_in_call_touch_round_hold" />
-            <TextView android:id="@+id/holdButtonLabel"
-                    style="@style/InCallRoundButtonLabel" />
-        </LinearLayout>
-
-        <!-- "Swap" (upper left) -->
-        <LinearLayout android:id="@+id/swapButtonContainer"
-                style="@style/InCallRoundButtonContainer"
-                android:layout_alignParentLeft="true"
-                android:layout_marginLeft="10dip"
-                android:visibility="gone">
-            <ImageButton android:id="@+id/swapButton"
-                    style="@style/InCallRoundTouchButton"
-                    android:src="@drawable/ic_in_call_touch_round_swap" />
-            <TextView android:id="@+id/swapButtonLabel"
-                style="@style/InCallRoundButtonLabel" />
-        </LinearLayout>
-
-        <!-- "Merge" (upper left) CDMA specific -->
-        <LinearLayout android:id="@+id/cdmaMergeButtonContainer"
-                style="@style/InCallRoundButtonContainer"
-                android:layout_alignParentLeft="true"
-                android:layout_marginLeft="10dip"
-                android:visibility="gone">
-            <ImageButton android:id="@+id/cdmaMergeButton"
-                    style="@style/InCallRoundTouchButton"
-                    android:src="@drawable/ic_in_call_touch_round_merge_call" />
-            <TextView
-                style="@style/InCallRoundButtonLabel"
-                android:text="@string/onscreenMergeCallsText" />
-        </LinearLayout>
-
-        <!-- DTMF dialpad shown in the upper part of the screen
-             (above the main cluster of buttons.) -->
-        <!-- TODO: this should be a ViewStub, and should only get inflated
-             when first needed. -->
-        <include layout="@layout/non_drawer_dialpad"/>
-
-        <!-- Main cluster of onscreen buttons on the lower part of the screen. -->
-        <LinearLayout android:id="@+id/bottomButtons"
-                      android:orientation="vertical"
-                      android:layout_width="fill_parent"
-                      android:layout_height="wrap_content"
-                      android:layout_alignParentBottom="true"
-                      android:paddingLeft="4dip"
-                      android:paddingRight="4dip"
-                      android:paddingBottom="0dip"
-                      >
-
-            <LinearLayout android:id="@+id/inCallControlsRow1"
-                          android:orientation="horizontal"
-                          android:layout_width="fill_parent"
-                          android:layout_height="wrap_content"
-                          android:layout_marginBottom="-5dip"
-                          >
-                <!-- The buttons in the top row all have an icon *and* a
-                     text label, so we use a <Button> with a "top"
-                     compound drawable (rather than an ImageButton, which
-                     can't have a label.)  Some buttons set the icon image
-                     here; others do it from Java if the image depends on
-                     the current state of the call. -->
-
-                <!-- The upper-left button in the main cluster is either
-                     "Add" or "Merge", depending on the state of the call. -->
-                <FrameLayout
-                    android:layout_width="1dip"
-                    android:layout_weight="1"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="8dip"
-                    android:layout_marginBottom="8dip"
-                    android:layout_marginLeft="8dip"
-                    android:layout_marginRight="8dip"
-                    >
-                    <!-- "Add Call" -->
-                    <Button android:id="@+id/addButton"
-                            style="@style/InCallTouchButton"
-                            android:layout_width="fill_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="0dip"
-                            android:layout_marginBottom="0dip"
-                            android:layout_marginLeft="0dip"
-                            android:layout_marginRight="0dip"
-                            android:text="@string/onscreenAddCallText"
-                            android:drawableTop="@drawable/ic_in_call_touch_add_call"
-                            />
-                    <!-- "Merge calls". GSM specific -->
-                    <Button android:id="@+id/mergeButton"
-                            style="@style/InCallTouchButton"
-                            android:layout_width="fill_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="0dip"
-                            android:layout_marginBottom="0dip"
-                            android:layout_marginLeft="0dip"
-                            android:layout_marginRight="0dip"
-                            android:text="@string/onscreenMergeCallsText"
-                            android:drawableTop="@drawable/ic_in_call_touch_merge_call"
-                            />
-                </FrameLayout>
-
-                <!-- "End call" -->
-                <Button android:id="@+id/endButton"
-                        style="@style/InCallTouchButton"
-                        android:layout_width="1dip"
-                        android:layout_weight="1"
-                        android:layout_height="wrap_content"
-                        android:text="@string/onscreenEndCallText"
-                        android:drawableTop="@drawable/ic_in_call_touch_end"
-                        android:textColor="@color/incall_endButtonLabel"
-                        />
-
-                <!-- "Dialpad" -->
-                <Button android:id="@+id/dialpadButton"
-                        style="@style/InCallTouchButton"
-                        android:layout_width="1dip"
-                        android:layout_weight="1"
-                        android:layout_height="wrap_content"
-                        android:text="@string/onscreenShowDialpadText"
-                        />
-            </LinearLayout>
-            <LinearLayout android:id="@+id/inCallControlsRow2"
-                          android:orientation="horizontal"
-                          android:layout_width="fill_parent"
-                          android:layout_height="wrap_content"
-                          android:layout_marginBottom="-5dip"
-                          >
-                <!-- "Bluetooth" -->
-                <ToggleButton android:id="@+id/bluetoothButton"
-                        style="@style/InCallTouchToggleButton"
-                        android:layout_width="1dip"
-                        android:layout_weight="1"
-                        android:layout_height="wrap_content"
-                        android:textOn="@string/onscreenBluetoothText"
-                        android:textOff="@string/onscreenBluetoothText"
-                        />
-                <!-- "Mute" -->
-                <ToggleButton android:id="@+id/muteButton"
-                        style="@style/InCallTouchToggleButton"
-                        android:layout_width="1dip"
-                        android:layout_weight="1"
-                        android:layout_height="wrap_content"
-                        android:textOn="@string/onscreenMuteText"
-                        android:textOff="@string/onscreenMuteText"
-                        />
-                <!-- "Speaker" -->
-                <ToggleButton android:id="@+id/speakerButton"
-                        style="@style/InCallTouchToggleButton"
-                        android:layout_width="1dip"
-                        android:layout_weight="1"
-                        android:layout_height="wrap_content"
-                        android:textOn="@string/onscreenSpeakerText"
-                        android:textOff="@string/onscreenSpeakerText"
-                        />
-            </LinearLayout>
-
-        </LinearLayout>
-
-    </RelativeLayout>
-
-</RelativeLayout>
diff --git a/overlay/ldpi/packages/apps/Phone/res/layout/call_card.xml b/overlay/ldpi/packages/apps/Phone/res/layout/call_card.xml
deleted file mode 100644
index 525ff01..0000000
--- a/overlay/ldpi/packages/apps/Phone/res/layout/call_card.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- XML resource file for the *children* of a CallCard used in the Phone app.
-     The CallCard itself is a subclass of FrameLayout, and its (single)
-     child is the LinearLayout found here.  (In the CallCard constructor,
-     we inflate this file and add it as a child.)
-     TODO: consider just <include>ing this directly from incall_screen.xml? -->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    >
-
-    <!-- Info about the "secondary" call, displayed at the upper right of
-         the screen.  (If you're on a call with both lines in use, this
-         area displays the status and caller-id info of the call on hold.)
-
-         This block of info needs to be Z-ordered underneath the
-         primaryCallInfo block, so it's the first child listed here. -->
-    <LinearLayout android:id="@+id/secondaryCallInfo"
-                  android:orientation="vertical"
-                  android:layout_width="160dp"
-                  android:layout_height="wrap_content"
-                  android:gravity="center_horizontal"
-                  android:layout_alignParentTop="true"
-                  android:layout_alignParentRight="true"
-                  android:layout_marginTop="6dp"
-                  >
-        <TextView android:id="@+id/secondaryCallStatus"
-              android:text="@string/onHold"
-              android:textAppearance="?android:attr/textAppearanceMedium"
-              android:textSize="14sp"
-              android:singleLine="true"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              />
-
-        <TextView android:id="@+id/secondaryCallName"
-              android:textAppearance="?android:attr/textAppearanceMedium"
-              android:textSize="14sp"
-              android:singleLine="true"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:layout_marginTop="-2dip"
-              />
-
-        <!-- Scaled-down photo, or else a generic placeholder image. -->
-        <ImageView android:id="@+id/secondaryCallPhoto"
-            android:layout_width="106dp"
-            android:layout_height="101dp"
-            android:layout_marginTop="-6dip"
-            android:background="@drawable/incall_photo_border_med"
-            android:contentDescription="@string/onHold"
-            />
-    </LinearLayout>
-
-    <!-- The main block of info about the "primary" or "active" call -->
-    <LinearLayout
-        android:id="@+id/primaryCallInfo"
-        android:orientation="vertical"
-        android:gravity="center_horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentTop="true"
-        android:layout_marginTop="2dip"
-        >
-
-        <!-- "Upper title" at the very top of the CallCard. -->
-        <TextView android:id="@+id/upperTitle"
-                  android:textAppearance="?android:attr/textAppearanceLarge"
-                  android:textSize="28sp"
-                  android:singleLine="true"
-                  android:layout_width="wrap_content"
-                  android:layout_height="wrap_content"
-                  android:layout_marginBottom="2dip"
-                  />
-
-        <!-- "Person info": photo / name / number -->
-        <include layout="@layout/call_card_person_info" />
-
-    </LinearLayout>    <!-- End of (1) The main call card -->
-
-    <!-- The hint about the Menu button, below all the call info.
-         This is only ever shown on devices that actually have a
-         menu while in-call, i.e. it's never shown on devices where the
-         InCallTouchUi is enabled (see InCallScreen.updateMenuButtonHint().) -->
-    <TextView android:id="@+id/menuButtonHint"
-              android:text="@string/menuButtonHint"
-              android:textAppearance="?android:attr/textAppearanceMedium"
-              android:textSize="18sp"
-              android:textColor="?android:attr/textColorSecondary"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:layout_below="@id/primaryCallInfo"
-              android:layout_marginTop="22dip"
-              android:layout_centerHorizontal="true"
-              android:visibility="gone"
-              />
-
-</RelativeLayout>
diff --git a/overlay/ldpi/packages/apps/Phone/res/layout/incall_touch_ui.xml b/overlay/ldpi/packages/apps/Phone/res/layout/incall_touch_ui.xml
deleted file mode 100644
index be15c52..0000000
--- a/overlay/ldpi/packages/apps/Phone/res/layout/incall_touch_ui.xml
+++ /dev/null
@@ -1,251 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- In-call onscreen touch UI elements, used on some platforms.
-
-     This layout is a fullscreen overlay, drawn on top of the
-     non-touch-sensitive parts of the in-call UI (i.e. the call card).
-
-     The top-level View here is a FrameLayout with 2 children:
-       (1) incomingCallWidget: the UI displayed while an incoming call is ringing
-       (2) inCallControls: the widgets visible while a regular call (or calls) is in progress
-     Exactly one of these is visible at any given moment.
-     -->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    >
-
-    <!-- (1) incomingCallWidget: the UI displayed while an incoming call is ringing. -->
-    <com.android.internal.widget.SlidingTab
-        android:id="@+id/incomingSlidingTabCallWidget"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:visibility="gone"
-        android:layout_alignParentBottom="true"
-        android:layout_marginBottom="40dip"
-        />
-
-    <!-- (1) incomingCallWidget: the UI displayed while an incoming call is ringing. -->
-    <com.android.internal.widget.RotarySelector
-        android:id="@+id/incomingRotarySelectorCallWidget"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:visibility="gone"
-        android:layout_alignParentBottom="true"
-        />
-
-    <!-- (1) incomingCallWidget: the UI displayed while an incoming call is ringing. -->
-    <com.android.internal.widget.RingSelector
-        android:id="@+id/incomingRingSelectorCallWidget"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:visibility="gone"
-        android:layout_alignParentBottom="true"
-        />
-
-    <!--
-        (2) inCallControls: the widgets visible while a regular call
-        (or calls) is in progress
-    -->
-    <RelativeLayout android:id="@+id/inCallControls"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_alignParentTop="true"
-                    android:visibility="gone"
-                    >
-        <!-- Buttons visible in the upper corners of the screen (in some states). -->
-        <!-- These are small round ImageButtons with a text label floating
-             off to the side. -->
-
-        <!-- "Hold" (upper left) -->
-        <!-- (Note "Hold", "Swap" and "Merge" are never available at
-             the same time.  That's why it's OK for them to be in the
-             same position onscreen.) -->
-        <LinearLayout android:id="@+id/holdButtonContainer"
-                style="@style/InCallRoundButtonContainer"
-                android:layout_alignParentLeft="true"
-                android:layout_marginLeft="10dip"
-                android:visibility="gone">
-            <ImageButton android:id="@+id/holdButton"
-                    style="@style/InCallRoundTouchButton"
-                    android:src="@drawable/ic_in_call_touch_round_hold"
-                    android:contentDescription="@string/onscreenHoldText" />
-            <TextView android:id="@+id/holdButtonLabel"
-                    style="@style/InCallRoundButtonLabel" />
-        </LinearLayout>
-
-        <!-- "Swap" (upper left) -->
-        <!-- This button's label changes to "Manage calls" in some CDMA states. -->
-        <LinearLayout android:id="@+id/swapButtonContainer"
-                style="@style/InCallRoundButtonContainer"
-                android:layout_alignParentLeft="true"
-                android:layout_marginLeft="10dip"
-                android:visibility="gone">
-            <ImageButton android:id="@+id/swapButton"
-                    style="@style/InCallRoundTouchButton"
-                    android:src="@drawable/ic_in_call_touch_round_swap"
-                    android:contentDescription="@string/onscreenSwapCallsText"/>
-            <TextView android:id="@+id/swapButtonLabel"
-                style="@style/InCallRoundButtonLabel" />
-        </LinearLayout>
-
-        <!-- CDMA-specific "Merge" (upper left) -->
-        <!-- This button is used only on CDMA devices, where we can't use
-             the Merge button in the main cluster (because the "Add Call"
-             button might need to be enabled at the same time.) -->
-        <LinearLayout android:id="@+id/cdmaMergeButtonContainer"
-                style="@style/InCallRoundButtonContainer"
-                android:layout_alignParentLeft="true"
-                android:layout_marginLeft="10dip"
-                android:visibility="gone">
-            <ImageButton android:id="@+id/cdmaMergeButton"
-                    style="@style/InCallRoundTouchButton"
-                    android:src="@drawable/ic_in_call_touch_round_merge_call"
-                    android:contentDescription="@string/onscreenMergeCallsText" />
-            <TextView
-                style="@style/InCallRoundButtonLabel"
-                android:text="@string/onscreenMergeCallsText" />
-        </LinearLayout>
-
-        <!-- DTMF dialpad shown in the upper part of the screen
-             (above the main cluster of buttons.) -->
-        <!-- TODO: this should be a ViewStub, and should only get inflated
-             when first needed. -->
-        <include layout="@layout/non_drawer_dialpad"/>
-
-        <!-- Main cluster of onscreen buttons on the lower part of the screen. -->
-        <LinearLayout android:id="@+id/bottomButtons"
-                      android:orientation="vertical"
-                      android:layout_width="match_parent"
-                      android:layout_height="wrap_content"
-                      android:layout_alignParentBottom="true"
-                      android:paddingLeft="4dip"
-                      android:paddingRight="4dip"
-                      android:paddingBottom="0dip"
-                      >
-
-            <LinearLayout android:id="@+id/inCallControlsRow1"
-                          android:orientation="horizontal"
-                          android:layout_width="match_parent"
-                          android:layout_height="wrap_content"
-                          >
-                <!-- The buttons in the top row all have an icon *and* a
-                     text label, so we use a <Button> with a "top"
-                     compound drawable (rather than an ImageButton, which
-                     can't have a label.)  Some buttons set the icon image
-                     here; others do it from Java if the image depends on
-                     the current state of the call. -->
-
-                <!-- The upper-left button in the main cluster is either
-                     "Add" or "Merge", depending on the state of the call. -->
-                <FrameLayout
-                    android:layout_width="1dip"
-                    android:layout_weight="1"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="0dip"
-                    android:layout_marginBottom="0dip"
-                    android:layout_marginLeft="8dip"
-                    android:layout_marginRight="8dip"
-                    >
-                    <!-- "Add Call" -->
-                    <Button android:id="@+id/addButton"
-                            style="@style/InCallTouchButton"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="0dip"
-                            android:layout_marginBottom="0dip"
-                            android:layout_marginLeft="0dip"
-                            android:layout_marginRight="0dip"
-                            android:text="@string/onscreenAddCallText"
-                            android:drawableTop="@drawable/ic_in_call_touch_add_call"
-                            />
-                    <!-- "Merge calls" -->
-                    <!-- This button is used only on GSM devices, where we know
-                         that "Add" and "Merge" are never available at the same time.
-                         The "Merge" button for CDMA devices is "cdmaMergeButton" above. -->
-                    <Button android:id="@+id/mergeButton"
-                            style="@style/InCallTouchButton"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="0dip"
-                            android:layout_marginBottom="0dip"
-                            android:layout_marginLeft="0dip"
-                            android:layout_marginRight="0dip"
-                            android:text="@string/onscreenMergeCallsText"
-                            android:drawableTop="@drawable/ic_in_call_touch_merge_call"
-                            />
-                </FrameLayout>
-
-                <!-- "End call" -->
-                <Button android:id="@+id/endButton"
-                        style="@style/InCallTouchButton"
-                        android:layout_width="1dip"
-                        android:layout_weight="1"
-                        android:layout_height="wrap_content"
-                        android:text="@string/onscreenEndCallText"
-                        android:drawableTop="@drawable/ic_in_call_touch_end"
-                        android:textColor="@color/incall_endButtonLabel"
-                        />
-
-                <!-- "Dialpad" -->
-                <Button android:id="@+id/dialpadButton"
-                        style="@style/InCallTouchButton"
-                        android:layout_width="1dip"
-                        android:layout_weight="1"
-                        android:layout_height="wrap_content"
-                        android:text="@string/onscreenShowDialpadText"
-                        />
-            </LinearLayout>
-            <LinearLayout android:id="@+id/inCallControlsRow2"
-                          android:orientation="horizontal"
-                          android:layout_width="match_parent"
-                          android:layout_height="wrap_content"
-                          >
-                <!-- "Bluetooth" -->
-                <ToggleButton android:id="@+id/bluetoothButton"
-                        style="@style/InCallTouchToggleButton"
-                        android:layout_width="1dip"
-                        android:layout_weight="1"
-                        android:layout_height="wrap_content"
-                        android:textOn="@string/onscreenBluetoothText"
-                        android:textOff="@string/onscreenBluetoothText"
-                        />
-                <!-- "Mute" -->
-                <ToggleButton android:id="@+id/muteButton"
-                        style="@style/InCallTouchToggleButton"
-                        android:layout_width="1dip"
-                        android:layout_weight="1"
-                        android:layout_height="wrap_content"
-                        android:textOn="@string/onscreenMuteText"
-                        android:textOff="@string/onscreenMuteText"
-                        />
-                <!-- "Speaker" -->
-                <ToggleButton android:id="@+id/speakerButton"
-                        style="@style/InCallTouchToggleButton"
-                        android:layout_width="1dip"
-                        android:layout_weight="1"
-                        android:layout_height="wrap_content"
-                        android:textOn="@string/onscreenSpeakerText"
-                        android:textOff="@string/onscreenSpeakerText"
-                        />
-            </LinearLayout>
-
-        </LinearLayout>
-
-    </RelativeLayout>
-
-</RelativeLayout>
diff --git a/overlay/ldpi/packages/apps/Phone/res/layout/incall_touch_ui_left.xml b/overlay/ldpi/packages/apps/Phone/res/layout/incall_touch_ui_left.xml
deleted file mode 100644
index 2a79902..0000000
--- a/overlay/ldpi/packages/apps/Phone/res/layout/incall_touch_ui_left.xml
+++ /dev/null
@@ -1,252 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- In-call onscreen touch UI elements, used on some platforms.
-
-     This layout is a fullscreen overlay, drawn on top of the
-     non-touch-sensitive parts of the in-call UI (i.e. the call card).
-
-     The top-level View here is a FrameLayout with 2 children:
-       (1) incomingCallWidget: the UI displayed while an incoming call is ringing
-       (2) inCallControls: the widgets visible while a regular call (or calls) is in progress
-     Exactly one of these is visible at any given moment.
-     -->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    >
-
-    <!-- (1) incomingCallWidget: the UI displayed while an incoming call is ringing. -->
-    <com.android.internal.widget.SlidingTab
-        android:id="@+id/incomingSlidingTabCallWidget"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:visibility="gone"
-        android:layout_alignParentBottom="true"
-        android:layout_marginBottom="40dip"
-        />
-
-    <!-- (1) incomingCallWidget: the UI displayed while an incoming call is ringing. -->
-    <com.android.internal.widget.RotarySelector
-        android:id="@+id/incomingRotarySelectorCallWidget"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:visibility="gone"
-        android:layout_alignParentBottom="true"
-        />
-
-    <!-- (1) incomingCallWidget: the UI displayed while an incoming call is ringing. -->
-    <com.android.internal.widget.RingSelector
-        android:id="@+id/incomingRingSelectorCallWidget"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:visibility="gone"
-        android:layout_alignParentBottom="true"
-        />
-
-    <!--
-        (2) inCallControls: the widgets visible while a regular call
-        (or calls) is in progress
-    -->
-    <RelativeLayout android:id="@+id/inCallControls"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_alignParentTop="true"
-                    android:visibility="gone"
-                    >
-        <!-- Buttons visible in the upper corners of the screen (in some states). -->
-        <!-- These are small round ImageButtons with a text label floating
-             off to the side. -->
-
-        <!-- "Hold" (upper left) -->
-        <!-- (Note "Hold", "Swap" and "Merge" are never available at
-             the same time.  That's why it's OK for them to be in the
-             same position onscreen.) -->
-        <LinearLayout android:id="@+id/holdButtonContainer"
-                style="@style/InCallRoundButtonContainer"
-                android:layout_alignParentRight="true"
-                android:layout_marginRight="10dip"
-                android:visibility="gone">
-            <ImageButton android:id="@+id/holdButton"
-                    style="@style/InCallRoundTouchButton"
-                    android:src="@drawable/ic_in_call_touch_round_hold"
-                    android:contentDescription="@string/onscreenHoldText" />
-            <TextView android:id="@+id/holdButtonLabel"
-                    style="@style/InCallRoundButtonLabel" />
-        </LinearLayout>
-
-        <!-- "Swap" (upper left) -->
-        <!-- This button's label changes to "Manage calls" in some CDMA states. -->
-        <LinearLayout android:id="@+id/swapButtonContainer"
-                style="@style/InCallRoundButtonContainer"
-                android:layout_alignParentRight="true"
-                android:layout_marginRight="10dip"
-                android:visibility="gone">
-            <ImageButton android:id="@+id/swapButton"
-                    style="@style/InCallRoundTouchButton"
-                    android:src="@drawable/ic_in_call_touch_round_swap"
-                    android:contentDescription="@string/onscreenSwapCallsText"/>
-            <TextView android:id="@+id/swapButtonLabel"
-                style="@style/InCallRoundButtonLabel" />
-        </LinearLayout>
-
-        <!-- CDMA-specific "Merge" (upper left) -->
-        <!-- This button is used only on CDMA devices, where we can't use
-             the Merge button in the main cluster (because the "Add Call"
-             button might need to be enabled at the same time.) -->
-        <LinearLayout android:id="@+id/cdmaMergeButtonContainer"
-                style="@style/InCallRoundButtonContainer"
-                android:layout_alignParentRight="true"
-                android:layout_marginRight="10dip"
-                android:visibility="gone">
-            <ImageButton android:id="@+id/cdmaMergeButton"
-                    style="@style/InCallRoundTouchButton"
-                    android:src="@drawable/ic_in_call_touch_round_merge_call"
-                    android:contentDescription="@string/onscreenMergeCallsText" />
-            <TextView
-                style="@style/InCallRoundButtonLabel"
-                android:text="@string/onscreenMergeCallsText" />
-        </LinearLayout>
-
-        <!-- DTMF dialpad shown in the upper part of the screen
-             (above the main cluster of buttons.) -->
-        <!-- TODO: this should be a ViewStub, and should only get inflated
-             when first needed. -->
-        <include layout="@layout/non_drawer_dialpad"/>
-
-        <!-- Main cluster of onscreen buttons on the lower part of the screen. -->
-        <LinearLayout android:id="@+id/bottomButtons"
-                      android:orientation="vertical"
-                      android:layout_width="match_parent"
-                      android:layout_height="wrap_content"
-                      android:layout_alignParentBottom="true"
-                      android:paddingLeft="4dip"
-                      android:paddingRight="4dip"
-                      android:paddingBottom="4dip"
-                      >
-
-            <LinearLayout android:id="@+id/inCallControlsRow1"
-                          android:orientation="horizontal"
-                          android:layout_width="match_parent"
-                          android:layout_height="wrap_content"
-                          >
-                <!-- The buttons in the top row all have an icon *and* a
-                     text label, so we use a <Button> with a "top"
-                     compound drawable (rather than an ImageButton, which
-                     can't have a label.)  Some buttons set the icon image
-                     here; others do it from Java if the image depends on
-                     the current state of the call. -->
-
-                <!-- "Dialpad" -->
-                <Button android:id="@+id/dialpadButton"
-                        style="@style/InCallTouchButton"
-                        android:layout_width="1dip"
-                        android:layout_weight="1"
-                        android:layout_height="wrap_content"
-                        android:text="@string/onscreenShowDialpadText"
-                        />
-
-                <!-- "End call" -->
-                <Button android:id="@+id/endButton"
-                        style="@style/InCallTouchButton"
-                        android:layout_width="1dip"
-                        android:layout_weight="1"
-                        android:layout_height="wrap_content"
-                        android:text="@string/onscreenEndCallText"
-                        android:drawableTop="@drawable/ic_in_call_touch_end"
-                        android:textColor="@color/incall_endButtonLabel"
-                        />
-
-                <!-- The upper-right button in the main cluster is either
-                     "Add" or "Merge", depending on the state of the call. -->
-                <FrameLayout
-                    android:layout_width="1dip"
-                    android:layout_weight="1"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="8dip"
-                    android:layout_marginBottom="8dip"
-                    android:layout_marginLeft="8dip"
-                    android:layout_marginRight="8dip"
-                    >
-                    <!-- "Add Call" -->
-                    <Button android:id="@+id/addButton"
-                            style="@style/InCallTouchButton"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="0dip"
-                            android:layout_marginBottom="0dip"
-                            android:layout_marginLeft="0dip"
-                            android:layout_marginRight="0dip"
-                            android:text="@string/onscreenAddCallText"
-                            android:drawableTop="@drawable/ic_in_call_touch_add_call"
-                            />
-                    <!-- "Merge calls" -->
-                    <!-- This button is used only on GSM devices, where we know
-                         that "Add" and "Merge" are never available at the same time.
-                         The "Merge" button for CDMA devices is "cdmaMergeButton" above. -->
-                    <Button android:id="@+id/mergeButton"
-                            style="@style/InCallTouchButton"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="0dip"
-                            android:layout_marginBottom="0dip"
-                            android:layout_marginLeft="0dip"
-                            android:layout_marginRight="0dip"
-                            android:text="@string/onscreenMergeCallsText"
-                            android:drawableTop="@drawable/ic_in_call_touch_merge_call"
-                            />
-                </FrameLayout>
-
-            </LinearLayout>
-            <LinearLayout android:id="@+id/inCallControlsRow2"
-                          android:orientation="horizontal"
-                          android:layout_width="match_parent"
-                          android:layout_height="wrap_content"
-                          >
-                <!-- "Speaker" -->
-                <ToggleButton android:id="@+id/speakerButton"
-                        style="@style/InCallTouchToggleButton"
-                        android:layout_width="1dip"
-                        android:layout_weight="1"
-                        android:layout_height="wrap_content"
-                        android:textOn="@string/onscreenSpeakerText"
-                        android:textOff="@string/onscreenSpeakerText"
-                        />
-                <!-- "Mute" -->
-                <ToggleButton android:id="@+id/muteButton"
-                        style="@style/InCallTouchToggleButton"
-                        android:layout_width="1dip"
-                        android:layout_weight="1"
-                        android:layout_height="wrap_content"
-                        android:textOn="@string/onscreenMuteText"
-                        android:textOff="@string/onscreenMuteText"
-                        />
-                <!-- "Bluetooth" -->
-                <ToggleButton android:id="@+id/bluetoothButton"
-                        style="@style/InCallTouchToggleButton"
-                        android:layout_width="1dip"
-                        android:layout_weight="1"
-                        android:layout_height="wrap_content"
-                        android:textOn="@string/onscreenBluetoothText"
-                        android:textOff="@string/onscreenBluetoothText"
-                        />
-            </LinearLayout>
-
-        </LinearLayout>
-
-    </RelativeLayout>
-
-</RelativeLayout>
diff --git a/overlay/ldpi/packages/apps/Phone/res/values/styles.xml b/overlay/ldpi/packages/apps/Phone/res/values/styles.xml
deleted file mode 100644
index 516da80..0000000
--- a/overlay/ldpi/packages/apps/Phone/res/values/styles.xml
+++ /dev/null
@@ -1,229 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <drawable name="separator_red">#FFAE1200</drawable>
-    <drawable name="separator_green">#FF008115</drawable>
-    <drawable name="grayBg">#FF333333</drawable>
-
-    <style name="Incoming">
-        <item name="android:windowFrame">@null</item>
-        <item name="android:windowBackground">@null</item>
-    </style>
-
-    <style name="IccPanel">
-        <item name="android:windowFrame">@null</item>
-        <item name="android:windowBackground">@drawable/grayBg</item>
-    </style>
-
-    <style name="AlertPanel">
-        <item name="android:windowFrame">@null</item>
-        <item name="android:windowBackground">@drawable/grayBg</item>
-    </style>
-
-    <style name="info_label">
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_width">wrap_content</item>
-        <item name="android:textAppearance">@style/TextAppearance.info_label</item>
-        <item name="android:paddingRight">4dip</item>
-    </style>
-
-    <style name="info_layout">
-        <item name="android:orientation">vertical</item>
-        <item name="android:paddingLeft">10dip</item>
-        <item name="android:paddingTop">10dip</item>
-        <item name="android:paddingRight">10dip</item>
-        <item name="android:paddingBottom">10dip</item>
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">match_parent</item>
-    </style>
-
-    <style name="entry_layout">
-        <item name="android:orientation">vertical</item>
-        <item name="android:layout_width">wrap_content</item>
-        <item name="android:layout_height">wrap_content</item>
-    </style>
-
-    <style name="TextAppearance" parent="android:TextAppearance">
-    </style>
-
-    <style name="TextAppearance.info_label">
-        <item name="android:textSize">14sp</item>
-        <item name="android:textStyle">bold</item>
-    </style>
-
-    <style name="incall_top_button" parent="android:Widget.Button">
-        <item name="android:gravity">center_vertical</item>
-        <item name="android:layout_width">0sp</item>
-        <item name="android:layout_weight">1</item>
-        <item name="android:layout_height">match_parent</item>
-        <item name="android:padding">0dip</item>
-        <item name="android:textAppearance">?android:attr/textAppearanceSmall</item>
-        <item name="android:textColor">#000</item>
-    </style>
-
-    <style name="TextAppearance.DialerLine1" parent="@android:style/TextAppearance.Widget.Button">
-        <item name="android:textSize">32sp</item>
-        <item name="android:textColor">@color/dialer_button_text</item>
-        <item name="android:textStyle">bold</item>
-    </style>
-
-    <style name="TextAppearance.DialerLine2" parent="@android:style/TextAppearance.Widget.Button">
-        <item name="android:textSize">18sp</item>
-        <item name="android:textColor">@color/dialer_button_text</item>
-    </style>
-
-    <style name="TextAppearance.EmergencyDialerLine1" parent="@android:style/TextAppearance.Widget.Button">
-        <item name="android:textSize">22sp</item>
-        <item name="android:textColor">#ffffff</item>
-    </style>
-
-    <style name="TextAppearance.EmergencyDialerLine2" parent="@android:style/TextAppearance.Widget.Button">
-        <item name="android:textSize">14sp</item>
-        <item name="android:textColor">#ffffff</item>
-    </style>
-
-    <!-- Preference Style for the phone number preferences -->
-    <style name="EditPhoneNumberPreference">
-        <item name="enableButtonText">@string/enable</item>
-        <item name="disableButtonText">@string/disable</item>
-        <item name="changeNumButtonText">@string/change_num</item>
-        <item name="confirmMode">activation</item>
-    </style>
-
-    <!-- Preference Style for the emergency callback mode -->
-    <!-- This styles is currently not used and just prepared for further usage -->
-    <style name="EmergencyCallBack">
-        <item name="android:textSize">20sp</item>
-        <item name="android:textColor">#ffffff</item>
-        <item name="android:windowNoTitle">true</item>
-        <item name="android:colorForeground">#fff</item>
-    </style>
-
-    <!-- Preference Style for the ERI text -->
-    <style name="EriWidgetBackground">
-    </style>
-
-    <style name="TextAppearance.EriWidget">
-        <item name="android:textSize">16sp</item>
-        <item name="android:textStyle">bold</item>
-        <item name="android:textColor">@android:color/black</item>
-    </style>
-
-    <!-- OTA Call Card styles -->
-    <style name="ccOtaButtonBar">
-        <!-- TODO: change height to 'wrap_content' when layout bug is fixed -->
-        <item name="android:layout_height">60dip</item>
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:background">@android:drawable/bottom_bar</item>
-    </style>
-
-    <style name="ccOtaButton">
-        <item name="android:layout_width">150dip</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_marginTop">5dip</item>
-        <item name="android:layout_marginBottom">5dip</item>
-    </style>
-
-    <style name="ccOtaNextButton" parent="ccOtaButton">
-        <!-- <item name="android:drawableRight">@drawable/ic_btn_next</item>
-             <item name="android:drawablePadding">10dip</item>
-          -->
-        <item name="android:layout_alignParentBottom">true</item>
-        <item name="android:layout_alignParentRight">true</item>
-        <item name="android:layout_marginRight">4dip</item>
-    </style>
-
-    <style name="ccOtaSkipButton" parent="ccOtaButton">
-        <item name="android:layout_alignParentBottom">true</item>
-        <item name="android:layout_alignParentLeft">true</item>
-        <item name="android:layout_marginLeft">4dip</item>
-    </style>
-
-    <style name="ccOtaDialVisible">
-        <item name="android:visibility">visible</item>
-    </style>
-
-    <style name="ccOtaWizardTitle">
-        <item name="android:textSize">22sp</item>
-        <item name="android:textColor">@color/ota_title_color</item>
-    </style>
-
-    <style name="ccOtaTextPrimary">
-        <item name="android:textColor">?android:attr/textColorPrimary</item>
-        <item name="android:textSize">17sp</item>
-    </style>
-
-    <!-- Regular (non-toggle) buttons in the in-call onscreen touch UI. -->
-    <style name="InCallTouchButton">
-        <item name="android:gravity">center</item>
-        <item name="android:background">@drawable/incall_button</item>
-        <item name="android:layout_marginTop">0dip</item>
-        <item name="android:layout_marginBottom">0dip</item>
-        <item name="android:layout_marginLeft">8dip</item>
-        <item name="android:layout_marginRight">8dip</item>
-        <item name="android:textAppearance">?android:attr/textAppearanceSmall</item>
-        <item name="android:textColor">?android:attr/textColorPrimary</item>
-        <item name="android:singleLine">true</item>
-        <item name="android:ellipsize">marquee</item>
-    </style>
-
-    <!-- Toggle buttons in the in-call onscreen touch UI. -->
-    <style name="InCallTouchToggleButton">
-        <item name="android:gravity">center</item>
-        <item name="android:background">@drawable/incall_toggle_button</item>
-        <item name="android:layout_marginTop">0dip</item>
-        <item name="android:layout_marginBottom">0dip</item>
-        <item name="android:layout_marginLeft">8dip</item>
-        <item name="android:layout_marginRight">8dip</item>
-        <item name="android:textAppearance">?android:attr/textAppearanceSmall</item>
-        <item name="android:textColor">?android:attr/textColorPrimary</item>
-        <item name="android:singleLine">true</item>
-        <item name="android:ellipsize">marquee</item>
-    </style>
-
-    <!-- Small round ImageButtons at the upper corners of the in-call onscreen touch UI. -->
-    <style name="InCallRoundTouchButton">
-        <item name="android:gravity">center</item>
-        <item name="android:layout_width">wrap_content</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:background">@drawable/incall_round_button</item>
-    </style>
-
-    <!-- Text label next to the small round ImageButtons at the upper
-         corners of the in-call onscreen touch UI. -->
-    <style name="InCallRoundButtonLabel">
-        <item name="android:textAppearance">?android:attr/textAppearanceMedium</item>
-        <item name="android:textSize">14sp</item>
-        <item name="android:layout_width">wrap_content</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_marginLeft">5dip</item>
-        <item name="android:layout_marginRight">5dip</item>
-    </style>
-
-    <!-- Style for the LinearLayout used to hold the ImageButton and
-         TextView for the small round buttons at the upper corners of the
-         in-call onscreen touch UI. -->
-    <style name="InCallRoundButtonContainer">
-        <item name="android:orientation">horizontal</item>
-        <item name="android:gravity">center_vertical</item>
-        <item name="android:layout_width">wrap_content</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_alignParentTop">true</item>
-        <item name="android:layout_marginTop">0dip</item>
-    </style>
-
-</resources>
diff --git a/overlay/ldpi/packages/apps/Settings/res/drawable-ldpi/app_gauge.9.png b/overlay/ldpi/packages/apps/Settings/res/drawable-ldpi/app_gauge.9.png
deleted file mode 100644
index f6c7c99..0000000
--- a/overlay/ldpi/packages/apps/Settings/res/drawable-ldpi/app_gauge.9.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/Settings/res/drawable-ldpi/ic_cyanogenmod.png b/overlay/ldpi/packages/apps/Settings/res/drawable-ldpi/ic_cyanogenmod.png
deleted file mode 100644
index 8a4cde9..0000000
--- a/overlay/ldpi/packages/apps/Settings/res/drawable-ldpi/ic_cyanogenmod.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/Settings/res/drawable-ldpi/ic_settings_about.png b/overlay/ldpi/packages/apps/Settings/res/drawable-ldpi/ic_settings_about.png
deleted file mode 100644
index b64d534..0000000
--- a/overlay/ldpi/packages/apps/Settings/res/drawable-ldpi/ic_settings_about.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/Settings/res/drawable-ldpi/ic_settings_accessibility.png b/overlay/ldpi/packages/apps/Settings/res/drawable-ldpi/ic_settings_accessibility.png
deleted file mode 100644
index 0796a5f..0000000
--- a/overlay/ldpi/packages/apps/Settings/res/drawable-ldpi/ic_settings_accessibility.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/Settings/res/drawable-ldpi/ic_settings_applications.png b/overlay/ldpi/packages/apps/Settings/res/drawable-ldpi/ic_settings_applications.png
deleted file mode 100644
index a51256b..0000000
--- a/overlay/ldpi/packages/apps/Settings/res/drawable-ldpi/ic_settings_applications.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/Settings/res/drawable-ldpi/ic_settings_bluetooth.png b/overlay/ldpi/packages/apps/Settings/res/drawable-ldpi/ic_settings_bluetooth.png
deleted file mode 100644
index 3284822..0000000
--- a/overlay/ldpi/packages/apps/Settings/res/drawable-ldpi/ic_settings_bluetooth.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/Settings/res/drawable-ldpi/ic_settings_call.png b/overlay/ldpi/packages/apps/Settings/res/drawable-ldpi/ic_settings_call.png
deleted file mode 100644
index 4ca80f4..0000000
--- a/overlay/ldpi/packages/apps/Settings/res/drawable-ldpi/ic_settings_call.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/Settings/res/drawable-ldpi/ic_settings_cell_standby.png b/overlay/ldpi/packages/apps/Settings/res/drawable-ldpi/ic_settings_cell_standby.png
deleted file mode 100644
index 5b4e26e..0000000
--- a/overlay/ldpi/packages/apps/Settings/res/drawable-ldpi/ic_settings_cell_standby.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/Settings/res/drawable-ldpi/ic_settings_date_time.png b/overlay/ldpi/packages/apps/Settings/res/drawable-ldpi/ic_settings_date_time.png
deleted file mode 100644
index 8c9d82a..0000000
--- a/overlay/ldpi/packages/apps/Settings/res/drawable-ldpi/ic_settings_date_time.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/Settings/res/drawable-ldpi/ic_settings_display.png b/overlay/ldpi/packages/apps/Settings/res/drawable-ldpi/ic_settings_display.png
deleted file mode 100644
index 4693369..0000000
--- a/overlay/ldpi/packages/apps/Settings/res/drawable-ldpi/ic_settings_display.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/Settings/res/drawable-ldpi/ic_settings_dock.png b/overlay/ldpi/packages/apps/Settings/res/drawable-ldpi/ic_settings_dock.png
deleted file mode 100644
index 6e0ed07..0000000
--- a/overlay/ldpi/packages/apps/Settings/res/drawable-ldpi/ic_settings_dock.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/Settings/res/drawable-ldpi/ic_settings_language.png b/overlay/ldpi/packages/apps/Settings/res/drawable-ldpi/ic_settings_language.png
deleted file mode 100644
index 24edc15..0000000
--- a/overlay/ldpi/packages/apps/Settings/res/drawable-ldpi/ic_settings_language.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/Settings/res/drawable-ldpi/ic_settings_launcher.png b/overlay/ldpi/packages/apps/Settings/res/drawable-ldpi/ic_settings_launcher.png
deleted file mode 100644
index 25d22ea..0000000
--- a/overlay/ldpi/packages/apps/Settings/res/drawable-ldpi/ic_settings_launcher.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/Settings/res/drawable-ldpi/ic_settings_phone_idle.png b/overlay/ldpi/packages/apps/Settings/res/drawable-ldpi/ic_settings_phone_idle.png
deleted file mode 100644
index 0add156..0000000
--- a/overlay/ldpi/packages/apps/Settings/res/drawable-ldpi/ic_settings_phone_idle.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/Settings/res/drawable-ldpi/ic_settings_privacy.png b/overlay/ldpi/packages/apps/Settings/res/drawable-ldpi/ic_settings_privacy.png
deleted file mode 100644
index 848ed4f..0000000
--- a/overlay/ldpi/packages/apps/Settings/res/drawable-ldpi/ic_settings_privacy.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/Settings/res/drawable-ldpi/ic_settings_profile.png b/overlay/ldpi/packages/apps/Settings/res/drawable-ldpi/ic_settings_profile.png
deleted file mode 100644
index 0e1abf4..0000000
--- a/overlay/ldpi/packages/apps/Settings/res/drawable-ldpi/ic_settings_profile.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/Settings/res/drawable-ldpi/ic_settings_security.png b/overlay/ldpi/packages/apps/Settings/res/drawable-ldpi/ic_settings_security.png
deleted file mode 100644
index b259033..0000000
--- a/overlay/ldpi/packages/apps/Settings/res/drawable-ldpi/ic_settings_security.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/Settings/res/drawable-ldpi/ic_settings_sound.png b/overlay/ldpi/packages/apps/Settings/res/drawable-ldpi/ic_settings_sound.png
deleted file mode 100644
index 415cbb2..0000000
--- a/overlay/ldpi/packages/apps/Settings/res/drawable-ldpi/ic_settings_sound.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/Settings/res/drawable-ldpi/ic_settings_speech.png b/overlay/ldpi/packages/apps/Settings/res/drawable-ldpi/ic_settings_speech.png
deleted file mode 100644
index 4e02f36..0000000
--- a/overlay/ldpi/packages/apps/Settings/res/drawable-ldpi/ic_settings_speech.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/Settings/res/drawable-ldpi/ic_settings_storage.png b/overlay/ldpi/packages/apps/Settings/res/drawable-ldpi/ic_settings_storage.png
deleted file mode 100644
index 3f181e8..0000000
--- a/overlay/ldpi/packages/apps/Settings/res/drawable-ldpi/ic_settings_storage.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/Settings/res/drawable-ldpi/ic_settings_sync.png b/overlay/ldpi/packages/apps/Settings/res/drawable-ldpi/ic_settings_sync.png
deleted file mode 100644
index c623264..0000000
--- a/overlay/ldpi/packages/apps/Settings/res/drawable-ldpi/ic_settings_sync.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/Settings/res/drawable-ldpi/ic_settings_voice_calls.png b/overlay/ldpi/packages/apps/Settings/res/drawable-ldpi/ic_settings_voice_calls.png
deleted file mode 100644
index c14f540..0000000
--- a/overlay/ldpi/packages/apps/Settings/res/drawable-ldpi/ic_settings_voice_calls.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/Settings/res/drawable-ldpi/ic_settings_wifi.png b/overlay/ldpi/packages/apps/Settings/res/drawable-ldpi/ic_settings_wifi.png
deleted file mode 100644
index a148fd4..0000000
--- a/overlay/ldpi/packages/apps/Settings/res/drawable-ldpi/ic_settings_wifi.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/Settings/res/drawable-ldpi/ic_settings_wireless.png b/overlay/ldpi/packages/apps/Settings/res/drawable-ldpi/ic_settings_wireless.png
deleted file mode 100644
index a2b6a7c..0000000
--- a/overlay/ldpi/packages/apps/Settings/res/drawable-ldpi/ic_settings_wireless.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/Settings/res/layout/choose_lock_password.xml b/overlay/ldpi/packages/apps/Settings/res/layout/choose_lock_password.xml
deleted file mode 100644
index 780e9d5..0000000
--- a/overlay/ldpi/packages/apps/Settings/res/layout/choose_lock_password.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-**
-** Copyright 2008, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License")
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical"
-    android:background="@android:color/background_dark"
-    android:gravity="center_horizontal">
-
-    <!-- header text ('Enter Pin') -->
-    <TextView android:id="@+id/headerText"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:lines="2"
-        android:textAppearance="?android:attr/textAppearanceMedium"/>
-
-    <!-- spacer above text entry field -->
-    <View
-        android:id="@+id/spacerBottom"
-        android:layout_width="fill_parent"
-        android:layout_height="1dip"
-        android:layout_marginTop="2dip"
-        android:background="@android:drawable/divider_horizontal_dark"
-    />
-
-    <!-- Password entry field -->
-    <EditText android:id="@+id/password_entry"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:singleLine="true"
-        android:textStyle="bold"
-        android:inputType="textPassword"
-        android:gravity="center"
-        android:layout_gravity="center"
-        android:textSize="28sp"
-        android:layout_marginTop="6dip"
-        android:layout_marginLeft="30dip"
-        android:layout_marginRight="30dip"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:background="@drawable/password_field_default"
-        android:textColor="#ffffffff"
-    />
-
-    <!-- Spacer between password entry and keyboard -->
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="0dip"
-        android:layout_weight="1" />
-
-    <!-- Alphanumeric keyboard -->
-    <com.android.internal.widget.PasswordEntryKeyboardView android:id="@+id/keyboard"
-        android:layout_alignParentBottom="true"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="#00000000"
-        android:layout_marginBottom="10dip"
-        android:keyBackground="@*android:drawable/btn_keyboard_key_fulltrans"
-    />
-
-    <RelativeLayout
-        android:layout_height="wrap_content"
-        android:layout_width="match_parent"
-        android:background="@android:drawable/bottom_bar">
-
-        <Button android:id="@+id/cancel_button"
-            android:layout_width="150dip"
-            android:layout_height="wrap_content"
-            android:layout_margin="5dip"
-            android:layout_alignParentLeft="true"
-            android:text="@string/lockpassword_cancel_label"
-        />
-
-        <Button android:id="@+id/next_button"
-            android:layout_width="150dip"
-            android:layout_height="wrap_content"
-            android:layout_margin="5dip"
-            android:layout_alignParentRight="true"
-            android:drawableRight="@drawable/ic_btn_next"
-            android:drawablePadding="10dip"
-            android:text="@string/lockpassword_continue_label"
-        />
-
-    </RelativeLayout>
-
-</LinearLayout>
diff --git a/overlay/ldpi/packages/apps/Settings/res/layout/choose_lock_pattern.xml b/overlay/ldpi/packages/apps/Settings/res/layout/choose_lock_pattern.xml
deleted file mode 100644
index 86e06bc..0000000
--- a/overlay/ldpi/packages/apps/Settings/res/layout/choose_lock_pattern.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient
-        xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/topLayout"
-    android:orientation="vertical"
-    android:layout_width="wrap_content"
-    android:layout_height="match_parent"
-    android:background="@color/black">
-
-    <!-- takes up all space above button bar at bottom -->
-    <LinearLayout
-        android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="0dip"
-        android:layout_weight="1">
-
-        <TextView android:id="@+id/headerText"
-            android:layout_width="match_parent"
-            android:layout_height="0dip"
-            android:layout_weight="1"
-            android:gravity="center"
-            android:textSize="18sp"
-            android:visibility="gone"/>
-
-        <View
-             android:background="@*android:drawable/code_lock_top"
-             android:layout_width="match_parent"
-             android:layout_height="2dip" />
-        <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
-             android:layout_width="wrap_content"
-             android:layout_height="wrap_content" />
-
-        <!-- bottom line looks bad when button bar is their too, omit in this case -->
-        <!--View
-             android:background="@*android:drawable/code_lock_bottom"
-             android:layout_width="match_parent"
-             android:layout_height="8dip" /-->
-
-        <TextView android:id="@+id/footerText"
-            android:layout_width="match_parent"
-            android:layout_height="0dip"
-            android:layout_weight="1"
-            android:gravity="center"
-            android:textSize="10sp"/>
-
-    </LinearLayout>
-
-
-    <LinearLayout style="@android:style/ButtonBar"
-        android:orientation="horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <Button android:id="@+id/footerLeftButton"
-            android:layout_height="wrap_content"
-            android:layout_width="140dip"
-            android:ellipsize="marquee"
-            android:singleLine="true"
-            android:text="@string/lockpattern_restart_button_text"/>
-
-        <View
-            android:visibility="invisible"
-            android:layout_height="0dip"
-            android:layout_width="1dip"
-            android:layout_weight="1" />
-
-        <Button android:id="@+id/footerRightButton"
-            android:layout_height="wrap_content"
-            android:layout_width="140dip"
-            android:ellipsize="marquee"
-            android:singleLine="true"
-            android:drawableRight="@drawable/ic_btn_next"
-            android:drawablePadding="3dip"
-            android:text="@string/lockpattern_confirm_button_text"/>
-
-    </LinearLayout>
-
-</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
diff --git a/overlay/ldpi/packages/apps/Settings/res/layout/choose_lock_pattern_example.xml b/overlay/ldpi/packages/apps/Settings/res/layout/choose_lock_pattern_example.xml
deleted file mode 100644
index 7c14e5f..0000000
--- a/overlay/ldpi/packages/apps/Settings/res/layout/choose_lock_pattern_example.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_height="match_parent"
-    android:layout_width="match_parent">
-
-    <ScrollView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_weight="1">
-
-        <LinearLayout
-            android:orientation="vertical"
-            android:layout_height="match_parent"
-            android:layout_width="match_parent"
-            android:padding="5dip">
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/lock_example_title"
-                android:gravity="center_horizontal"
-                style="?android:attr/textAppearanceLarge"
-                android:visibility="gone"
-            />
-
-            <ImageView android:id="@+id/lock_anim"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="0dip"
-                android:layout_gravity="center_horizontal"
-                android:focusable="false"
-                android:clickable="false"
-            />
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="5dip"
-                android:text="@string/lock_example_message"
-                android:layout_gravity="left"
-                style="?android:attr/textAppearanceMedium"
-                                android:visibility="gone"
-            />
-
-        </LinearLayout>
-
-    </ScrollView>
-
-    <LinearLayout style="@android:style/ButtonBar"
-        android:orientation="horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <Button android:id="@+id/skip_button"
-            android:layout_height="wrap_content"
-            android:layout_width="140dip"
-            android:ellipsize="marquee"
-            android:singleLine="true"
-            android:text="@string/skip_button_label"
-        />
-
-        <!-- Placeholder to get blank space between the two buttons -->
-        <View
-            android:visibility="invisible"
-            android:layout_height="0dip"
-            android:layout_width="1dip"
-            android:layout_weight="1" />
-
-        <Button android:id="@+id/next_button"
-            android:layout_height="wrap_content"
-            android:layout_width="140dip"
-            android:ellipsize="marquee"
-            android:singleLine="true"
-            android:drawableRight="@drawable/ic_btn_next"
-            android:drawablePadding="3dip"
-            android:text="@string/next_button_label"
-        />
-
-    </LinearLayout>
-
-</LinearLayout>
diff --git a/overlay/ldpi/packages/apps/Settings/res/layout/confirm_lock_pattern.xml b/overlay/ldpi/packages/apps/Settings/res/layout/confirm_lock_pattern.xml
deleted file mode 100644
index 4261f11..0000000
--- a/overlay/ldpi/packages/apps/Settings/res/layout/confirm_lock_pattern.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient
-        xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/topLayout"
-    android:orientation="vertical"
-    android:layout_width="wrap_content"
-    android:layout_height="match_parent"
-    android:background="@color/black">
-
-    <TextView android:id="@+id/headerText"
-        android:layout_width="match_parent"
-        android:layout_height="0dip"
-        android:layout_weight="1.0"
-        android:gravity="center"
-        android:textSize="18sp"
-        android:visibility="gone"/>
-
-    <View
-         android:background="@*android:drawable/code_lock_top"
-         android:layout_width="match_parent"
-         android:layout_height="2dip" />
-    <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
-         android:layout_width="wrap_content"
-         android:layout_height="wrap_content" />
-    <View
-         android:background="@*android:drawable/code_lock_bottom"
-         android:layout_width="match_parent"
-         android:layout_height="8dip" />
-
-    <TextView android:id="@+id/footerText"
-        android:layout_width="match_parent"
-        android:layout_height="0dip"
-        android:layout_weight="1.0"
-        android:gravity="center"
-        android:textSize="10sp"/>
-
-
-</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
diff --git a/overlay/ldpi/packages/apps/Settings/res/layout/twelve_key_entry.xml b/overlay/ldpi/packages/apps/Settings/res/layout/twelve_key_entry.xml
deleted file mode 100644
index 4555b91..0000000
--- a/overlay/ldpi/packages/apps/Settings/res/layout/twelve_key_entry.xml
+++ /dev/null
@@ -1,181 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2008, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- This is not a standalone element it can be included into apps that need 12-key input -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="50dip"
-        android:layout_marginLeft="2dip"
-        android:layout_marginRight="2dip"
-        android:orientation="horizontal">
-
-        <Button android:id="@+id/one"
-            android:layout_width="0sp"
-            android:layout_height="fill_parent"
-            android:layout_weight="1"
-            android:layout_marginLeft="2dip"
-            android:layout_marginRight="2dip"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:textStyle="bold"
-        />
-
-        <Button android:id="@+id/two"
-            android:layout_width="0sp"
-            android:layout_height="fill_parent"
-            android:layout_weight="1"
-            android:layout_marginLeft="2dip"
-            android:layout_marginRight="2dip"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:textStyle="bold"
-        />
-
-        <Button android:id="@+id/three"
-            android:layout_width="0sp"
-            android:layout_height="fill_parent"
-            android:layout_weight="1"
-            android:layout_marginLeft="2dip"
-            android:layout_marginRight="2dip"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:textStyle="bold"
-        />
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="50dip"
-        android:layout_marginLeft="2dip"
-        android:layout_marginRight="2dip"
-        android:orientation="horizontal">
-
-        <Button android:id="@+id/four"
-            android:layout_width="0sp"
-            android:layout_height="fill_parent"
-            android:layout_weight="1"
-            android:layout_marginLeft="2dip"
-            android:layout_marginRight="2dip"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:textStyle="bold"
-        />
-
-        <Button android:id="@+id/five"
-            android:layout_width="0sp"
-            android:layout_height="fill_parent"
-            android:layout_weight="1"
-            android:layout_marginLeft="2dip"
-            android:layout_marginRight="2dip"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:textStyle="bold"
-        />
-
-        <Button android:id="@+id/six"
-            android:layout_width="0sp"
-            android:layout_height="fill_parent"
-            android:layout_weight="1"
-            android:layout_marginLeft="2dip"
-            android:layout_marginRight="2dip"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:textStyle="bold"
-        />
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="50dip"
-        android:layout_marginLeft="2dip"
-        android:layout_marginRight="2dip"
-        android:orientation="horizontal">
-
-        <Button android:id="@+id/seven"
-            android:layout_width="0sp"
-            android:layout_height="fill_parent"
-            android:layout_weight="1"
-            android:layout_marginLeft="2dip"
-            android:layout_marginRight="2dip"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:textStyle="bold"
-        />
-
-        <Button android:id="@+id/eight"
-            android:layout_width="0sp"
-            android:layout_height="fill_parent"
-            android:layout_weight="1"
-            android:layout_marginLeft="2dip"
-            android:layout_marginRight="2dip"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:textStyle="bold"
-        />
-
-        <Button android:id="@+id/nine"
-            android:layout_width="0sp"
-            android:layout_height="fill_parent"
-            android:layout_weight="1"
-            android:layout_marginLeft="2dip"
-            android:layout_marginRight="2dip"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:textStyle="bold"
-        />
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="50dip"
-        android:layout_marginLeft="2dip"
-        android:layout_marginRight="2dip"
-        android:orientation="horizontal">
-
-        <Button android:id="@+id/ok"
-            android:layout_width="0sp"
-            android:layout_height="fill_parent"
-            android:layout_weight="1"
-            android:layout_marginLeft="2dip"
-            android:layout_marginRight="2dip"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:textStyle="bold"
-            android:text="@android:string/ok"
-        />
-
-        <Button android:id="@+id/zero"
-            android:layout_width="0sp"
-            android:layout_height="fill_parent"
-            android:layout_weight="1"
-            android:layout_marginLeft="2dip"
-            android:layout_marginRight="2dip"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:textStyle="bold"
-        />
-
-        <Button android:id="@+id/cancel"
-            android:layout_width="0sp"
-            android:layout_height="fill_parent"
-            android:layout_weight="1"
-            android:layout_marginLeft="2dip"
-            android:layout_marginRight="2dip"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:textStyle="bold"
-            android:text="@android:string/cancel"
-        />
-
-    </LinearLayout>
-
-</LinearLayout>
diff --git a/overlay/ldpi/packages/apps/Stk/res/drawable-mdpi/ic_launcher_sim_toolkit.png b/overlay/ldpi/packages/apps/Stk/res/drawable-mdpi/ic_launcher_sim_toolkit.png
deleted file mode 100644
index 0ec525f..0000000
--- a/overlay/ldpi/packages/apps/Stk/res/drawable-mdpi/ic_launcher_sim_toolkit.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/Torch/res/drawable-mdpi/bulb_off.png b/overlay/ldpi/packages/apps/Torch/res/drawable-mdpi/bulb_off.png
deleted file mode 100644
index 14d4eae..0000000
--- a/overlay/ldpi/packages/apps/Torch/res/drawable-mdpi/bulb_off.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/Torch/res/drawable-mdpi/bulb_on.png b/overlay/ldpi/packages/apps/Torch/res/drawable-mdpi/bulb_on.png
deleted file mode 100644
index 60f0a53..0000000
--- a/overlay/ldpi/packages/apps/Torch/res/drawable-mdpi/bulb_on.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/inputmethods/LatinIME/java/res/drawable-ldpi/btn_keyboard_key_dark_normal.9.png b/overlay/ldpi/packages/inputmethods/LatinIME/java/res/drawable-ldpi/btn_keyboard_key_dark_normal.9.png
deleted file mode 100644
index c5794a3..0000000
--- a/overlay/ldpi/packages/inputmethods/LatinIME/java/res/drawable-ldpi/btn_keyboard_key_dark_normal.9.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/inputmethods/LatinIME/java/res/drawable-ldpi/btn_keyboard_key_dark_normal_off.9.png b/overlay/ldpi/packages/inputmethods/LatinIME/java/res/drawable-ldpi/btn_keyboard_key_dark_normal_off.9.png
deleted file mode 100644
index 1553774..0000000
--- a/overlay/ldpi/packages/inputmethods/LatinIME/java/res/drawable-ldpi/btn_keyboard_key_dark_normal_off.9.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/inputmethods/LatinIME/java/res/drawable-ldpi/btn_keyboard_key_dark_normal_on.9.png b/overlay/ldpi/packages/inputmethods/LatinIME/java/res/drawable-ldpi/btn_keyboard_key_dark_normal_on.9.png
deleted file mode 100644
index 005f939..0000000
--- a/overlay/ldpi/packages/inputmethods/LatinIME/java/res/drawable-ldpi/btn_keyboard_key_dark_normal_on.9.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/inputmethods/LatinIME/java/res/drawable-ldpi/btn_keyboard_key_dark_pressed.9.png b/overlay/ldpi/packages/inputmethods/LatinIME/java/res/drawable-ldpi/btn_keyboard_key_dark_pressed.9.png
deleted file mode 100644
index b086574..0000000
--- a/overlay/ldpi/packages/inputmethods/LatinIME/java/res/drawable-ldpi/btn_keyboard_key_dark_pressed.9.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/inputmethods/LatinIME/java/res/drawable-ldpi/btn_keyboard_key_dark_pressed_off.9.png b/overlay/ldpi/packages/inputmethods/LatinIME/java/res/drawable-ldpi/btn_keyboard_key_dark_pressed_off.9.png
deleted file mode 100644
index fc8072d..0000000
--- a/overlay/ldpi/packages/inputmethods/LatinIME/java/res/drawable-ldpi/btn_keyboard_key_dark_pressed_off.9.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/inputmethods/LatinIME/java/res/drawable-ldpi/btn_keyboard_key_dark_pressed_on.9.png b/overlay/ldpi/packages/inputmethods/LatinIME/java/res/drawable-ldpi/btn_keyboard_key_dark_pressed_on.9.png
deleted file mode 100644
index efdc928..0000000
--- a/overlay/ldpi/packages/inputmethods/LatinIME/java/res/drawable-ldpi/btn_keyboard_key_dark_pressed_on.9.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/inputmethods/LatinIME/java/res/drawable-ldpi/btn_keyboard_key_light_normal.9.png b/overlay/ldpi/packages/inputmethods/LatinIME/java/res/drawable-ldpi/btn_keyboard_key_light_normal.9.png
deleted file mode 100644
index 44d04bf..0000000
--- a/overlay/ldpi/packages/inputmethods/LatinIME/java/res/drawable-ldpi/btn_keyboard_key_light_normal.9.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/inputmethods/LatinIME/java/res/drawable-ldpi/btn_keyboard_key_light_pressed.9.png b/overlay/ldpi/packages/inputmethods/LatinIME/java/res/drawable-ldpi/btn_keyboard_key_light_pressed.9.png
deleted file mode 100644
index f7158c2..0000000
--- a/overlay/ldpi/packages/inputmethods/LatinIME/java/res/drawable-ldpi/btn_keyboard_key_light_pressed.9.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/inputmethods/LatinIME/java/res/drawable-ldpi/keyboard_hint_0.9.png b/overlay/ldpi/packages/inputmethods/LatinIME/java/res/drawable-ldpi/keyboard_hint_0.9.png
deleted file mode 100644
index b8e9d9c..0000000
--- a/overlay/ldpi/packages/inputmethods/LatinIME/java/res/drawable-ldpi/keyboard_hint_0.9.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/inputmethods/LatinIME/java/res/drawable-ldpi/keyboard_hint_1.9.png b/overlay/ldpi/packages/inputmethods/LatinIME/java/res/drawable-ldpi/keyboard_hint_1.9.png
deleted file mode 100644
index f8f09d0..0000000
--- a/overlay/ldpi/packages/inputmethods/LatinIME/java/res/drawable-ldpi/keyboard_hint_1.9.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/inputmethods/LatinIME/java/res/drawable-ldpi/keyboard_hint_2.9.png b/overlay/ldpi/packages/inputmethods/LatinIME/java/res/drawable-ldpi/keyboard_hint_2.9.png
deleted file mode 100644
index 3d6b547..0000000
--- a/overlay/ldpi/packages/inputmethods/LatinIME/java/res/drawable-ldpi/keyboard_hint_2.9.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/inputmethods/LatinIME/java/res/drawable-ldpi/keyboard_hint_3.9.png b/overlay/ldpi/packages/inputmethods/LatinIME/java/res/drawable-ldpi/keyboard_hint_3.9.png
deleted file mode 100644
index d51bcc5..0000000
--- a/overlay/ldpi/packages/inputmethods/LatinIME/java/res/drawable-ldpi/keyboard_hint_3.9.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/inputmethods/LatinIME/java/res/drawable-ldpi/keyboard_hint_4.9.png b/overlay/ldpi/packages/inputmethods/LatinIME/java/res/drawable-ldpi/keyboard_hint_4.9.png
deleted file mode 100644
index 5966380..0000000
--- a/overlay/ldpi/packages/inputmethods/LatinIME/java/res/drawable-ldpi/keyboard_hint_4.9.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/inputmethods/LatinIME/java/res/drawable-ldpi/keyboard_hint_5.9.png b/overlay/ldpi/packages/inputmethods/LatinIME/java/res/drawable-ldpi/keyboard_hint_5.9.png
deleted file mode 100644
index 4c470f7..0000000
--- a/overlay/ldpi/packages/inputmethods/LatinIME/java/res/drawable-ldpi/keyboard_hint_5.9.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/inputmethods/LatinIME/java/res/drawable-ldpi/keyboard_hint_6.9.png b/overlay/ldpi/packages/inputmethods/LatinIME/java/res/drawable-ldpi/keyboard_hint_6.9.png
deleted file mode 100644
index dd37c78..0000000
--- a/overlay/ldpi/packages/inputmethods/LatinIME/java/res/drawable-ldpi/keyboard_hint_6.9.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/inputmethods/LatinIME/java/res/drawable-ldpi/keyboard_hint_7.9.png b/overlay/ldpi/packages/inputmethods/LatinIME/java/res/drawable-ldpi/keyboard_hint_7.9.png
deleted file mode 100644
index 68801b2..0000000
--- a/overlay/ldpi/packages/inputmethods/LatinIME/java/res/drawable-ldpi/keyboard_hint_7.9.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/inputmethods/LatinIME/java/res/drawable-ldpi/keyboard_hint_8.9.png b/overlay/ldpi/packages/inputmethods/LatinIME/java/res/drawable-ldpi/keyboard_hint_8.9.png
deleted file mode 100644
index 7da313d..0000000
--- a/overlay/ldpi/packages/inputmethods/LatinIME/java/res/drawable-ldpi/keyboard_hint_8.9.png
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/inputmethods/LatinIME/java/res/drawable-ldpi/keyboard_hint_9.9.png b/overlay/ldpi/packages/inputmethods/LatinIME/java/res/drawable-ldpi/keyboard_hint_9.9.png
deleted file mode 100644
index bb12bcf..0000000
--- a/overlay/ldpi/packages/inputmethods/LatinIME/java/res/drawable-ldpi/keyboard_hint_9.9.png
+++ /dev/null
Binary files differ
diff --git a/overlay/legend/packages/apps/CMParts/res/values/config.xml b/overlay/legend/packages/apps/CMParts/res/values/config.xml
deleted file mode 100644
index 93f1eb4..0000000
--- a/overlay/legend/packages/apps/CMParts/res/values/config.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- Whether or not to display the trackball settings -->
-    <bool name="has_trackball">true</bool>
-
-    <!-- Whether or not to display the camera button settings -->
-    <bool name="has_camera_button">false</bool>
-
-    <bool name="has_rgb_notification_led">false</bool>
-    <bool name="has_dual_notification_led">false</bool>
-
-    <!-- LED Flashlight -->
-    <bool name="has_led_flash">true</bool>
-
-    <!-- Whether or not to display search button settings -->
-    <bool name="has_search_button">true</bool>
-</resources>
diff --git a/overlay/leo/packages/apps/Camera/res/values/config.xml b/overlay/leo/packages/apps/Camera/res/values/config.xml
deleted file mode 100644
index 35f3cef..0000000
--- a/overlay/leo/packages/apps/Camera/res/values/config.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2011, The CyanogenMod Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- These resources are around just to allow their values to be customized
-     for different hardware and product builds. -->
-<resources>
-        <!-- FFC parameter filtering -->
-        <bool name="ffc_canFocus">false</bool>
-        <bool name="ffc_canZoom">false</bool>
-        <string name="ffc_supportedEffects">none,mono,sepia</string>
-</resources>
-
diff --git a/overlay/mecha/frameworks/base/core/res/res/values/config.xml b/overlay/mecha/frameworks/base/core/res/res/values/config.xml
deleted file mode 100644
index 960a389..0000000
--- a/overlay/mecha/frameworks/base/core/res/res/values/config.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2011, The CyanogenMod Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<resources>
-
-    <!-- Component name of the default wallpaper. This will be ImageWallpaper if not
-         specified -->
-    <string name="default_wallpaper_component">com.android.wallpaper/.nexus.NexusWallpaper</string>
-
-</resources>
diff --git a/overlay/mecha/packages/apps/CMParts/res/values/config.xml b/overlay/mecha/packages/apps/CMParts/res/values/config.xml
deleted file mode 100644
index bbe40af..0000000
--- a/overlay/mecha/packages/apps/CMParts/res/values/config.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- Whether or not to display the trackball settings -->
-    <bool name="has_trackball">false</bool>
-    <bool name="has_rgb_notification_led">false</bool>
-    <bool name="has_led_flash">true</bool>
-</resources>
diff --git a/overlay/mesmerizemtd/frameworks/base/core/res/res/values/config.xml b/overlay/mesmerizemtd/frameworks/base/core/res/res/values/config.xml
deleted file mode 100644
index 8b667e7..0000000
--- a/overlay/mesmerizemtd/frameworks/base/core/res/res/values/config.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2009, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-<resources>
-
-    <!-- Component name of the default wallpaper. This will be ImageWallpaper if not 
-         specified -->
-    <string name="default_wallpaper_component">com.android.wallpaper/.nexus.NexusWallpaper</string>
-
-</resources>
diff --git a/overlay/mesmerizemtd/packages/apps/CMParts/res/values/config.xml b/overlay/mesmerizemtd/packages/apps/CMParts/res/values/config.xml
deleted file mode 100644
index 357f4bf..0000000
--- a/overlay/mesmerizemtd/packages/apps/CMParts/res/values/config.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- Whether or not to display the trackball settings -->
-    <bool name="has_trackball">false</bool>
-    <bool name="has_rgb_notification_led">false</bool>
-    <bool name="has_camera_button">false</bool>
-    <bool name="has_led_flash">true</bool>
-    <bool name="has_search_button">true</bool>
-</resources>
diff --git a/overlay/morrison/packages/apps/CMParts/res/values/config.xml b/overlay/morrison/packages/apps/CMParts/res/values/config.xml
deleted file mode 100644
index 913a3db..0000000
--- a/overlay/morrison/packages/apps/CMParts/res/values/config.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- Whether or not to display the trackball settings -->
-    <bool name="has_trackball">false</bool>
-    <bool name="has_camera_button">true</bool>
-    <bool name="has_rgb_notification_led">false</bool>
-    <bool name="has_led_flash">true</bool>
-</resources>
diff --git a/overlay/motus/packages/apps/CMParts/res/values/config.xml b/overlay/motus/packages/apps/CMParts/res/values/config.xml
deleted file mode 100644
index 0c5ac3b..0000000
--- a/overlay/motus/packages/apps/CMParts/res/values/config.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- Whether or not to display the trackball settings -->
-    <bool name="has_trackball">false</bool>
-    <bool name="has_camera_button">true</bool>
-    <bool name="has_rgb_notification_led">false</bool>
-    <bool name="has_led_flash">true</bool>
-    <bool name="has_backtrack_minipad">true</bool>
-    <bool name="has_envelope_key">true</bool>
-    <bool name="has_explorer_key">true</bool>
-</resources>
diff --git a/overlay/olympus/frameworks/base/core/res/res/drawable-hdpi/jog_dial_arrow_long_left_green.png b/overlay/olympus/frameworks/base/core/res/res/drawable-hdpi/jog_dial_arrow_long_left_green.png
deleted file mode 100644
index a04c5c4..0000000
--- a/overlay/olympus/frameworks/base/core/res/res/drawable-hdpi/jog_dial_arrow_long_left_green.png
+++ /dev/null
Binary files differ
diff --git a/overlay/olympus/frameworks/base/core/res/res/drawable-hdpi/jog_dial_arrow_long_left_yellow.png b/overlay/olympus/frameworks/base/core/res/res/drawable-hdpi/jog_dial_arrow_long_left_yellow.png
deleted file mode 100644
index c58c68d..0000000
--- a/overlay/olympus/frameworks/base/core/res/res/drawable-hdpi/jog_dial_arrow_long_left_yellow.png
+++ /dev/null
Binary files differ
diff --git a/overlay/olympus/frameworks/base/core/res/res/drawable-hdpi/jog_dial_arrow_long_middle_yellow.png b/overlay/olympus/frameworks/base/core/res/res/drawable-hdpi/jog_dial_arrow_long_middle_yellow.png
deleted file mode 100644
index c2f7c5d..0000000
--- a/overlay/olympus/frameworks/base/core/res/res/drawable-hdpi/jog_dial_arrow_long_middle_yellow.png
+++ /dev/null
Binary files differ
diff --git a/overlay/olympus/frameworks/base/core/res/res/drawable-hdpi/jog_dial_arrow_long_right_red.png b/overlay/olympus/frameworks/base/core/res/res/drawable-hdpi/jog_dial_arrow_long_right_red.png
deleted file mode 100644
index e77bb18..0000000
--- a/overlay/olympus/frameworks/base/core/res/res/drawable-hdpi/jog_dial_arrow_long_right_red.png
+++ /dev/null
Binary files differ
diff --git a/overlay/olympus/frameworks/base/core/res/res/drawable-hdpi/jog_dial_arrow_long_right_yellow.png b/overlay/olympus/frameworks/base/core/res/res/drawable-hdpi/jog_dial_arrow_long_right_yellow.png
deleted file mode 100644
index c20c1f4..0000000
--- a/overlay/olympus/frameworks/base/core/res/res/drawable-hdpi/jog_dial_arrow_long_right_yellow.png
+++ /dev/null
Binary files differ
diff --git a/overlay/olympus/frameworks/base/core/res/res/drawable-hdpi/jog_dial_arrow_short_left.png b/overlay/olympus/frameworks/base/core/res/res/drawable-hdpi/jog_dial_arrow_short_left.png
deleted file mode 100644
index 8306273..0000000
--- a/overlay/olympus/frameworks/base/core/res/res/drawable-hdpi/jog_dial_arrow_short_left.png
+++ /dev/null
Binary files differ
diff --git a/overlay/olympus/frameworks/base/core/res/res/drawable-hdpi/jog_dial_arrow_short_left_and_right.png b/overlay/olympus/frameworks/base/core/res/res/drawable-hdpi/jog_dial_arrow_short_left_and_right.png
deleted file mode 100644
index f925053..0000000
--- a/overlay/olympus/frameworks/base/core/res/res/drawable-hdpi/jog_dial_arrow_short_left_and_right.png
+++ /dev/null
Binary files differ
diff --git a/overlay/olympus/frameworks/base/core/res/res/drawable-hdpi/jog_dial_arrow_short_right.png b/overlay/olympus/frameworks/base/core/res/res/drawable-hdpi/jog_dial_arrow_short_right.png
deleted file mode 100644
index e23327d..0000000
--- a/overlay/olympus/frameworks/base/core/res/res/drawable-hdpi/jog_dial_arrow_short_right.png
+++ /dev/null
Binary files differ
diff --git a/overlay/olympus/frameworks/base/core/res/res/drawable-hdpi/jog_dial_bg.png b/overlay/olympus/frameworks/base/core/res/res/drawable-hdpi/jog_dial_bg.png
deleted file mode 100644
index a3290a6..0000000
--- a/overlay/olympus/frameworks/base/core/res/res/drawable-hdpi/jog_dial_bg.png
+++ /dev/null
Binary files differ
diff --git a/overlay/olympus/frameworks/base/core/res/res/drawable-hdpi/jog_dial_bg_rev.png b/overlay/olympus/frameworks/base/core/res/res/drawable-hdpi/jog_dial_bg_rev.png
deleted file mode 100644
index a4f7431..0000000
--- a/overlay/olympus/frameworks/base/core/res/res/drawable-hdpi/jog_dial_bg_rev.png
+++ /dev/null
Binary files differ
diff --git a/overlay/olympus/frameworks/base/core/res/res/drawable-hdpi/jog_dial_bg_rev_down.png b/overlay/olympus/frameworks/base/core/res/res/drawable-hdpi/jog_dial_bg_rev_down.png
deleted file mode 100644
index cfd10d2..0000000
--- a/overlay/olympus/frameworks/base/core/res/res/drawable-hdpi/jog_dial_bg_rev_down.png
+++ /dev/null
Binary files differ
diff --git a/overlay/olympus/frameworks/base/core/res/res/drawable-hdpi/lense_square_bg.png b/overlay/olympus/frameworks/base/core/res/res/drawable-hdpi/lense_square_bg.png
deleted file mode 100644
index 2e109c0..0000000
--- a/overlay/olympus/frameworks/base/core/res/res/drawable-hdpi/lense_square_bg.png
+++ /dev/null
Binary files differ
diff --git a/overlay/olympus/frameworks/base/core/res/res/values/config.xml b/overlay/olympus/frameworks/base/core/res/res/values/config.xml
deleted file mode 100644
index 960a389..0000000
--- a/overlay/olympus/frameworks/base/core/res/res/values/config.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2011, The CyanogenMod Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<resources>
-
-    <!-- Component name of the default wallpaper. This will be ImageWallpaper if not
-         specified -->
-    <string name="default_wallpaper_component">com.android.wallpaper/.nexus.NexusWallpaper</string>
-
-</resources>
diff --git a/overlay/olympus/packages/inputmethods/LatinIME/java/res/values-land/dimens.xml b/overlay/olympus/packages/inputmethods/LatinIME/java/res/values-land/dimens.xml
deleted file mode 100644
index 97e674e..0000000
--- a/overlay/olympus/packages/inputmethods/LatinIME/java/res/values-land/dimens.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* 
-**
-** Copyright 2008, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-
-<resources>
-    <!-- key_height + key_bottom_gap = popup_key_height -->
-    <dimen name="key_height">0.300in</dimen>
-    <dimen name="key_bottom_gap">0.040in</dimen>
-    <dimen name="popup_key_height">0.340in</dimen>
-    <dimen name="keyboard_bottom_padding">0.0in</dimen>
-    <dimen name="candidate_strip_height">38dip</dimen>
-    <dimen name="candidate_strip_fading_edge_length">63dip</dimen>
-    <dimen name="spacebar_vertical_correction">2dip</dimen>
-    <!-- Amount of allowance for selecting keys in a mini popup keyboard by sliding finger. -->
-    <!-- popup_key_height x 1.7 -->
-    <dimen name="mini_keyboard_slide_allowance">0.459in</dimen>
-    <!-- popup_key_height x 1.0 -->
-    <dimen name="mini_keyboard_vertical_correction">-0.270in</dimen>
-</resources>
diff --git a/overlay/olympus/packages/inputmethods/LatinIME/java/res/values/dimens.xml b/overlay/olympus/packages/inputmethods/LatinIME/java/res/values/dimens.xml
deleted file mode 100644
index 319de14..0000000
--- a/overlay/olympus/packages/inputmethods/LatinIME/java/res/values/dimens.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* 
-**
-** Copyright 2008, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-
-<resources>
-    <!-- key_height + key_bottom_gap = popup_key_height -->
-    <dimen name="key_height">0.300in</dimen>
-    <dimen name="key_bottom_gap">0.040in</dimen>
-    <dimen name="popup_key_height">0.340in</dimen>
-    <dimen name="keyboard_bottom_padding">0.06in</dimen>
-    <dimen name="bubble_pointer_offset">22dip</dimen>
-    <dimen name="candidate_strip_height">42dip</dimen>
-    <dimen name="candidate_strip_fading_edge_length">63dip</dimen>
-    <dimen name="spacebar_vertical_correction">4dip</dimen>
-    <!-- If the screen height in landscape is larger than the below value, then the keyboard
-         will not go into extract (fullscreen) mode. -->
-    <dimen name="max_height_for_fullscreen">2.8in</dimen>
-    <dimen name="key_text_size">0.13in</dimen>
-    <dimen name="key_label_text_size">0.083in</dimen>
-    <dimen name="key_preview_text_size_large">40sp</dimen>
-    <dimen name="key_preview_offset">0.000in</dimen>
-    <!-- key_preview_text_size_large x 2 -->
-    <dimen name="key_preview_height">80sp</dimen>
-    <!-- Amount of allowance for selecting keys in a mini popup keyboard by sliding finger. -->
-    <!-- popup_key_height x 1.7 -->
-    <dimen name="mini_keyboard_slide_allowance">0.553in</dimen>
-    <!-- popup_key_height x 1.0 -->
-    <dimen name="mini_keyboard_vertical_correction">-0.325in</dimen>
-    <dimen name="key_hysteresis_distance">0.05in</dimen>
-    <!-- We use "inch", not "dip" because this value tries dealing with physical distance related
-         to user's finger. -->
-    <dimen name="keyboard_vertical_correction">-0.05in</dimen>
-    <dimen name="candidate_min_touchable_width">0.3in</dimen>
-</resources>
diff --git a/overlay/passion/frameworks/base/core/res/res/values/config.xml b/overlay/passion/frameworks/base/core/res/res/values/config.xml
deleted file mode 100644
index 960a389..0000000
--- a/overlay/passion/frameworks/base/core/res/res/values/config.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2011, The CyanogenMod Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<resources>
-
-    <!-- Component name of the default wallpaper. This will be ImageWallpaper if not
-         specified -->
-    <string name="default_wallpaper_component">com.android.wallpaper/.nexus.NexusWallpaper</string>
-
-</resources>
diff --git a/overlay/passion/packages/apps/CMParts/res/values/config.xml b/overlay/passion/packages/apps/CMParts/res/values/config.xml
deleted file mode 100644
index 7cfa356..0000000
--- a/overlay/passion/packages/apps/CMParts/res/values/config.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- Whether or not to display the trackball settings -->
-    <bool name="has_trackball">true</bool>
-    <bool name="has_rgb_notification_led">true</bool>
-
-    <bool name="has_led_flash">true</bool>
-</resources>
diff --git a/overlay/shadow/packages/apps/CMParts/res/values/config.xml b/overlay/shadow/packages/apps/CMParts/res/values/config.xml
deleted file mode 100644
index b9582a8..0000000
--- a/overlay/shadow/packages/apps/CMParts/res/values/config.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- Whether or not to display the trackball settings -->
-    <bool name="has_trackball">false</bool>
-    <bool name="has_camera_button">true</bool>
-    <bool name="has_rgb_notification_led">true</bool>
-    <bool name="has_led_flash">true</bool>
-</resources>
diff --git a/overlay/sholes/packages/apps/CMParts/res/values/config.xml b/overlay/sholes/packages/apps/CMParts/res/values/config.xml
deleted file mode 100644
index b9582a8..0000000
--- a/overlay/sholes/packages/apps/CMParts/res/values/config.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- Whether or not to display the trackball settings -->
-    <bool name="has_trackball">false</bool>
-    <bool name="has_camera_button">true</bool>
-    <bool name="has_rgb_notification_led">true</bool>
-    <bool name="has_led_flash">true</bool>
-</resources>
diff --git a/overlay/showcasemtd/frameworks/base/core/res/res/values/config.xml b/overlay/showcasemtd/frameworks/base/core/res/res/values/config.xml
deleted file mode 100644
index 8b667e7..0000000
--- a/overlay/showcasemtd/frameworks/base/core/res/res/values/config.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2009, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-<resources>
-
-    <!-- Component name of the default wallpaper. This will be ImageWallpaper if not 
-         specified -->
-    <string name="default_wallpaper_component">com.android.wallpaper/.nexus.NexusWallpaper</string>
-
-</resources>
diff --git a/overlay/showcasemtd/packages/apps/CMParts/res/values/config.xml b/overlay/showcasemtd/packages/apps/CMParts/res/values/config.xml
deleted file mode 100644
index 357f4bf..0000000
--- a/overlay/showcasemtd/packages/apps/CMParts/res/values/config.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- Whether or not to display the trackball settings -->
-    <bool name="has_trackball">false</bool>
-    <bool name="has_rgb_notification_led">false</bool>
-    <bool name="has_camera_button">false</bool>
-    <bool name="has_led_flash">true</bool>
-    <bool name="has_search_button">true</bool>
-</resources>
diff --git a/overlay/smb_a1002/packages/apps/ADWLauncher/res/values/config.xml b/overlay/smb_a1002/packages/apps/ADWLauncher/res/values/config.xml
deleted file mode 100644
index d2606e9..0000000
--- a/overlay/smb_a1002/packages/apps/ADWLauncher/res/values/config.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- config_desktopColumns/Rows min value is 3, so it will add 3 to whatever value you set here -->
-    <integer name="config_desktopColumns">5</integer>
-    <integer name="config_desktopRows">4</integer>
-</resources>
diff --git a/overlay/smb_a1002/packages/apps/CMParts/res/values/config.xml b/overlay/smb_a1002/packages/apps/CMParts/res/values/config.xml
deleted file mode 100644
index 4cab749..0000000
--- a/overlay/smb_a1002/packages/apps/CMParts/res/values/config.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- Whether or not to display the trackball settings -->
-    <bool name="has_trackball">false</bool>
-
-    <bool name="has_led_flash">false</bool>
-</resources>
diff --git a/overlay/smb_a1002/packages/apps/Contacts/AndroidManifest.xml b/overlay/smb_a1002/packages/apps/Contacts/AndroidManifest.xml
deleted file mode 100644
index 425bce6..0000000
--- a/overlay/smb_a1002/packages/apps/Contacts/AndroidManifest.xml
+++ /dev/null
@@ -1,491 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2006 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.contacts"
-    android:sharedUserId="android.uid.shared"
->
-
-    <original-package android:name="com.android.contacts" />
-
-    <uses-permission android:name="android.permission.CALL_PRIVILEGED" />
-    <uses-permission android:name="android.permission.READ_CONTACTS" />
-    <uses-permission android:name="android.permission.WRITE_CONTACTS" />
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
-    <uses-permission android:name="android.permission.MODIFY_PHONE_STATE" />
-    <uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH.mail" />
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.WRITE_SETTINGS" />
-    <uses-permission android:name="android.permission.USE_CREDENTIALS" />
-    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
-    <uses-permission android:name="android.permission.VIBRATE" />
-
-    <application
-        android:label="@string/contactsList"
-        android:icon="@drawable/ic_launcher_contacts"
-        android:process="android.process.acore"
-        android:taskAffinity="android.task.contacts"
-    >
-
-        <!-- A virtual 12 key dialer -->
-        <activity android:name="TwelveKeyDialer"
-            android:launchMode="singleTop"
-        >
-            <intent-filter>
-                <action android:name="com.android.phone.action.TOUCH_DIALER" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.TAB" />
-            </intent-filter>
-        </activity>
-
-        <!-- A list of recent calls -->
-        <activity android:name="RecentCallsListActivity"
-            android:label="@string/recentCallsIconLabel"
-        >
-            <intent-filter>
-                <action android:name="com.android.phone.action.RECENT_CALLS" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.TAB" />
-            </intent-filter>
-        </activity>
-
-        <!-- Tab container for all tabs -->
-        <activity android:name="DialtactsActivity"
-            android:label="@string/launcherDialer"
-            android:theme="@style/DialtactsTheme"
-            android:launchMode="singleTask"
-            android:clearTaskOnLaunch="true"
-            android:icon="@drawable/ic_launcher_phone"
-            android:screenOrientation="nosensor"
-            android:enabled="false"
-        >
-            <intent-filter>
-                <action android:name="android.intent.action.DIAL" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-                <data android:mimeType="vnd.android.cursor.item/phone" />
-                <data android:mimeType="vnd.android.cursor.item/person" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.DIAL" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-                <data android:scheme="voicemail" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.DIAL" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
-                <category android:name="android.intent.category.BROWSABLE" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-                <action android:name="android.intent.action.DIAL" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-                <data android:scheme="tel" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-                <data android:mimeType="vnd.android.cursor.dir/calls" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.CALL_BUTTON" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-            </intent-filter>
-        </activity>
-
-        <!-- Tab container for all tabs -->
-        <activity-alias android:name="DialtactsContactsEntryActivity"
-            android:targetActivity="DialtactsActivity"
-            android:label="@string/contactsList"
-            android:icon="@drawable/ic_launcher_contacts"
-        >
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
-                <category android:name="android.intent.category.BROWSABLE" />
-            </intent-filter>
-
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="vnd.android.cursor.dir/person" android:host="contacts" />
-                <data android:mimeType="vnd.android.cursor.dir/contact" android:host="com.android.contacts" />
-            </intent-filter>
-
-        </activity-alias>
-
-        <!-- Main launch Intent to open the Contacts app. This will open the app in its last manual
-        state. This is the state that has been explicitly set by the user (e.g. by clicking a tab).
-        States configured via other Intents (e.g. CallLog after Call) are not considered manual
-        state. At the moment, the Intent always goes to the DialtactsActivity, but this might later
-        be changed to also include sub-activities like Edit or View if they were left open -->
-
-        <activity-alias android:name="ContactsLaunchActivity"
-            android:targetActivity="DialtactsActivity"
-        >
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-            </intent-filter>
-        </activity-alias>
-
-        <!-- An empty activity that presents the DialtactActivity's Favorites tab -->
-        <activity-alias android:name="DialtactsFavoritesEntryActivity"
-            android:targetActivity="DialtactsActivity"
-        >
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity-alias>
-
-        <!-- The actual list of contacts, usually embedded in ContactsActivity -->
-        <activity android:name="ContactsListActivity"
-            android:label="@string/contactsList"
-            android:clearTaskOnLaunch="true"
-        >
-            <intent-filter>
-                <action android:name="com.android.contacts.action.LIST_DEFAULT" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.TAB" />
-            </intent-filter>
-
-            <intent-filter>
-                <action android:name="com.android.contacts.action.LIST_CONTACTS" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.TAB" />
-            </intent-filter>
-
-            <intent-filter>
-                <action android:name="com.android.contacts.action.LIST_ALL_CONTACTS" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.TAB" />
-            </intent-filter>
-
-            <intent-filter>
-                <action android:name="com.android.contacts.action.LIST_CONTACTS_WITH_PHONES" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.TAB" />
-            </intent-filter>
-
-            <intent-filter android:label="@string/starredList">
-                <action android:name="com.android.contacts.action.LIST_STARRED" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.TAB" />
-            </intent-filter>
-
-            <intent-filter android:label="@string/frequentList">
-                <action android:name="com.android.contacts.action.LIST_FREQUENT" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.TAB" />
-            </intent-filter>
-
-            <intent-filter android:label="@string/strequentList">
-                <action android:name="com.android.contacts.action.LIST_STREQUENT" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.TAB" />
-            </intent-filter>
-
-            <intent-filter>
-                <action android:name="android.intent.action.INSERT_OR_EDIT" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="vnd.android.cursor.item/person" />
-                <data android:mimeType="vnd.android.cursor.item/contact" />
-                <data android:mimeType="vnd.android.cursor.item/raw_contact" />
-            </intent-filter>
-
-            <intent-filter>
-                <action android:name="android.intent.action.PICK" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="vnd.android.cursor.dir/contact" android:host="com.android.contacts" />
-                <data android:mimeType="vnd.android.cursor.dir/person" android:host="contacts" />
-                <data android:mimeType="vnd.android.cursor.dir/phone_v2" android:host="com.android.contacts" />
-                <data android:mimeType="vnd.android.cursor.dir/phone" android:host="contacts" />
-                <data android:mimeType="vnd.android.cursor.dir/postal-address_v2" android:host="com.android.contacts" />
-                <data android:mimeType="vnd.android.cursor.dir/postal-address" android:host="contacts" />
-            </intent-filter>
-
-            <intent-filter>
-                <action android:name="android.intent.action.GET_CONTENT" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="vnd.android.cursor.item/contact" android:host="com.android.contacts" />
-                <data android:mimeType="vnd.android.cursor.item/person" android:host="contacts" />
-                <data android:mimeType="vnd.android.cursor.item/phone_v2" android:host="com.android.contacts" />
-                <data android:mimeType="vnd.android.cursor.item/phone" android:host="contacts" />
-                <data android:mimeType="vnd.android.cursor.item/postal-address_v2" android:host="com.android.contacts" />
-                <data android:mimeType="vnd.android.cursor.item/postal-address" android:host="contacts" />
-            </intent-filter>
-
-        </activity>
-
-        <!-- An activity for joining contacts -->
-        <activity android:name="ContactsListActivity$JoinContactActivity"
-            android:theme="@style/TallTitleBarTheme"
-            android:clearTaskOnLaunch="true"
-        >
-            <intent-filter>
-                <action android:name="com.android.contacts.action.JOIN_AGGREGATE" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
-
-        <!-- The contacts search/filter UI -->
-        <activity android:name="ContactsListActivity$ContactsSearchActivity"
-            android:theme="@style/ContactsSearchTheme"
-            android:windowSoftInputMode="stateAlwaysVisible|adjustPan"
-        >
-            <intent-filter>
-                <action android:name="com.android.contacts.action.FILTER_CONTACTS" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="vnd.android.cursor.dir/contact" android:host="com.android.contacts" />
-            </intent-filter>
-        </activity>
-
-        <!-- The contacts search/filter UI -->
-        <activity android:name="SearchResultsActivity"
-            android:theme="@style/TallTitleBarTheme"
-            android:label="@string/contactsList"
-        >
-            <intent-filter>
-                <action android:name="android.intent.action.SEARCH" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-
-            <meta-data android:name="android.app.searchable"
-                android:resource="@xml/searchable"
-            />
-        </activity>
-
-        <!-- Used to select display and sync groups -->
-        <activity android:name=".ui.ContactsPreferencesActivity" android:label="@string/displayGroups" />
-
-        <activity
-            android:name=".ui.ShowOrCreateActivity"
-            android:theme="@style/FullyTranslucent">
-
-            <intent-filter>
-                <action android:name="com.android.contacts.action.SHOW_OR_CREATE_CONTACT" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:scheme="mailto" />
-                <data android:scheme="tel" />
-            </intent-filter>
-        </activity>
-
-        <!-- Used to show QuickContact window over a translucent activity, which is a
-             temporary hack until we add better framework support. -->
-        <activity
-            android:name=".ui.QuickContactActivity"
-            android:theme="@style/FullyTranslucent.QuickContact"
-            android:launchMode="singleTop"
-            android:excludeFromRecents="true"
-            android:taskAffinity="android.task.quickcontact"
-            android:windowSoftInputMode="stateUnchanged"
-            >
-
-            <intent-filter>
-                <action android:name="com.android.contacts.action.QUICK_CONTACT" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="vnd.android.cursor.item/contact" android:host="com.android.contacts" />
-                <data android:mimeType="vnd.android.cursor.item/person" android:host="contacts" />
-            </intent-filter>
-        </activity>
-
-        <activity-alias android:name="ContactShortcut"
-            android:targetActivity="ContactsListActivity"
-            android:label="@string/shortcutContact"
-            android:icon="@drawable/ic_launcher_shortcut_contact">
-
-            <intent-filter>
-                <action android:name="android.intent.action.CREATE_SHORTCUT" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-
-        </activity-alias>
-
-        <activity-alias android:name="alias.DialShortcut"
-            android:targetActivity="ContactsListActivity"
-            android:label="@string/shortcutDialContact"
-            android:icon="@drawable/ic_launcher_shortcut_directdial">
-
-            <intent-filter>
-                <action android:name="android.intent.action.CREATE_SHORTCUT" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.CAR_MODE" />
-            </intent-filter>
-
-        </activity-alias>
-
-        <activity-alias android:name="alias.MessageShortcut"
-            android:targetActivity="ContactsListActivity"
-            android:label="@string/shortcutMessageContact"
-            android:icon="@drawable/ic_launcher_shortcut_directmessage">
-
-            <intent-filter>
-                <action android:name="android.intent.action.CREATE_SHORTCUT" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-
-        </activity-alias>
-
-        <activity android:name="CallDetailActivity"
-            android:label="@string/callDetailTitle"
-            android:theme="@style/TallTitleBarTheme"
-        >
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="vnd.android.cursor.item/calls" />
-            </intent-filter>
-        </activity>
-
-        <!-- Views the details of a single contact -->
-        <activity android:name="ViewContactActivity"
-            android:label="@string/viewContactTitle"
-            android:theme="@style/TallTitleBarTheme">
-
-            <intent-filter android:label="@string/viewContactDesription">
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="vnd.android.cursor.item/person" android:host="contacts" />
-                <data android:mimeType="vnd.android.cursor.item/contact" android:host="com.android.contacts" />
-                <data android:mimeType="vnd.android.cursor.item/raw_contact" android:host="com.android.contacts" />
-            </intent-filter>
-        </activity>
-
-        <!-- Edit or insert details for a contact -->
-        <activity
-            android:name=".ui.EditContactActivity"
-            android:windowSoftInputMode="stateHidden|adjustResize">
-
-            <intent-filter android:label="@string/editContactDescription">
-                <action android:name="android.intent.action.EDIT" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="vnd.android.cursor.item/person" android:host="contacts" />
-                <data android:mimeType="vnd.android.cursor.item/contact" android:host="com.android.contacts" />
-                <data android:mimeType="vnd.android.cursor.item/raw_contact" android:host="com.android.contacts" />
-            </intent-filter>
-
-            <intent-filter android:label="@string/insertContactDescription">
-                <action android:name="android.intent.action.INSERT" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="vnd.android.cursor.dir/person" />
-                <data android:mimeType="vnd.android.cursor.dir/contact" />
-                <data android:mimeType="vnd.android.cursor.dir/raw_contact" />
-            </intent-filter>
-
-        </activity>
-
-        <!-- Stub service used to keep our process alive long enough for
-             background threads to finish their operations. -->
-        <service
-            android:name=".util.EmptyService"
-            android:exported="false" />
-
-        <!-- Views the details of a single contact -->
-        <activity android:name="ContactOptionsActivity"
-            android:label="@string/contactOptionsTitle"
-        >
-            <intent-filter>
-                <action android:name="android.intent.action.EDIT" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
-
-        <!-- Attaches a photo to a contact. Started from external applications -->
-        <activity android:name="AttachImage"
-            android:label="@string/attachToContact"
-            android:taskAffinity="">
-            <intent-filter>
-                <action android:name="android.intent.action.ATTACH_DATA" />
-                <data android:mimeType="image/*" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-            />
-        </activity>
-
-        <!-- Makes .ContactsListActivity the search target for any activity in Contacts -->
-        <meta-data
-            android:name="android.app.default_searchable"
-            android:value=".ContactsListActivity" />
-
-
-        <!-- LIVE FOLDERS -->
-        <activity
-            android:name=".ContactsLiveFolders$AllContacts"
-            android:label="@string/liveFolderAll"
-            android:icon="@drawable/ic_launcher_folder_live_contacts">
-            <intent-filter>
-                <action android:name="android.intent.action.CREATE_LIVE_FOLDER" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
-
-        <activity
-            android:name=".ContactsLiveFolders$StarredContacts"
-            android:label="@string/liveFolderFavorites"
-            android:icon="@drawable/ic_launcher_folder_live_contacts_starred">
-            <intent-filter>
-                <action android:name="android.intent.action.CREATE_LIVE_FOLDER" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
-
-        <activity
-            android:name=".ContactsLiveFolders$PhoneContacts"
-            android:label="@string/liveFolderPhone"
-            android:icon="@drawable/ic_launcher_folder_live_contacts_phone">
-            <intent-filter>
-                <action android:name="android.intent.action.CREATE_LIVE_FOLDER" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name=".ImportVCardActivity"
-            android:theme="@style/BackgroundOnly">
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-                <data android:mimeType="text/directory" />
-                <data android:mimeType="text/x-vcard" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name=".ExportVCardActivity"
-            android:theme="@style/BackgroundOnly" />
-
-            <!-- Wysie_Soh: Custom Intents -->
-        <activity android:name="ContactsPreferences">
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
-
-    </application>
-</manifest>
diff --git a/overlay/smb_b9701/packages/apps/ADWLauncher/res/values/config.xml b/overlay/smb_b9701/packages/apps/ADWLauncher/res/values/config.xml
deleted file mode 100644
index d2606e9..0000000
--- a/overlay/smb_b9701/packages/apps/ADWLauncher/res/values/config.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- config_desktopColumns/Rows min value is 3, so it will add 3 to whatever value you set here -->
-    <integer name="config_desktopColumns">5</integer>
-    <integer name="config_desktopRows">4</integer>
-</resources>
diff --git a/overlay/smb_b9701/packages/apps/CMParts/res/values/config.xml b/overlay/smb_b9701/packages/apps/CMParts/res/values/config.xml
deleted file mode 100644
index 4cab749..0000000
--- a/overlay/smb_b9701/packages/apps/CMParts/res/values/config.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- Whether or not to display the trackball settings -->
-    <bool name="has_trackball">false</bool>
-
-    <bool name="has_led_flash">false</bool>
-</resources>
diff --git a/overlay/smb_b9701/packages/apps/Contacts/AndroidManifest.xml b/overlay/smb_b9701/packages/apps/Contacts/AndroidManifest.xml
deleted file mode 100644
index 425bce6..0000000
--- a/overlay/smb_b9701/packages/apps/Contacts/AndroidManifest.xml
+++ /dev/null
@@ -1,491 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2006 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.contacts"
-    android:sharedUserId="android.uid.shared"
->
-
-    <original-package android:name="com.android.contacts" />
-
-    <uses-permission android:name="android.permission.CALL_PRIVILEGED" />
-    <uses-permission android:name="android.permission.READ_CONTACTS" />
-    <uses-permission android:name="android.permission.WRITE_CONTACTS" />
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
-    <uses-permission android:name="android.permission.MODIFY_PHONE_STATE" />
-    <uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH.mail" />
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.WRITE_SETTINGS" />
-    <uses-permission android:name="android.permission.USE_CREDENTIALS" />
-    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
-    <uses-permission android:name="android.permission.VIBRATE" />
-
-    <application
-        android:label="@string/contactsList"
-        android:icon="@drawable/ic_launcher_contacts"
-        android:process="android.process.acore"
-        android:taskAffinity="android.task.contacts"
-    >
-
-        <!-- A virtual 12 key dialer -->
-        <activity android:name="TwelveKeyDialer"
-            android:launchMode="singleTop"
-        >
-            <intent-filter>
-                <action android:name="com.android.phone.action.TOUCH_DIALER" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.TAB" />
-            </intent-filter>
-        </activity>
-
-        <!-- A list of recent calls -->
-        <activity android:name="RecentCallsListActivity"
-            android:label="@string/recentCallsIconLabel"
-        >
-            <intent-filter>
-                <action android:name="com.android.phone.action.RECENT_CALLS" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.TAB" />
-            </intent-filter>
-        </activity>
-
-        <!-- Tab container for all tabs -->
-        <activity android:name="DialtactsActivity"
-            android:label="@string/launcherDialer"
-            android:theme="@style/DialtactsTheme"
-            android:launchMode="singleTask"
-            android:clearTaskOnLaunch="true"
-            android:icon="@drawable/ic_launcher_phone"
-            android:screenOrientation="nosensor"
-            android:enabled="false"
-        >
-            <intent-filter>
-                <action android:name="android.intent.action.DIAL" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-                <data android:mimeType="vnd.android.cursor.item/phone" />
-                <data android:mimeType="vnd.android.cursor.item/person" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.DIAL" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-                <data android:scheme="voicemail" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.DIAL" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
-                <category android:name="android.intent.category.BROWSABLE" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-                <action android:name="android.intent.action.DIAL" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-                <data android:scheme="tel" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-                <data android:mimeType="vnd.android.cursor.dir/calls" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.CALL_BUTTON" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-            </intent-filter>
-        </activity>
-
-        <!-- Tab container for all tabs -->
-        <activity-alias android:name="DialtactsContactsEntryActivity"
-            android:targetActivity="DialtactsActivity"
-            android:label="@string/contactsList"
-            android:icon="@drawable/ic_launcher_contacts"
-        >
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
-                <category android:name="android.intent.category.BROWSABLE" />
-            </intent-filter>
-
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="vnd.android.cursor.dir/person" android:host="contacts" />
-                <data android:mimeType="vnd.android.cursor.dir/contact" android:host="com.android.contacts" />
-            </intent-filter>
-
-        </activity-alias>
-
-        <!-- Main launch Intent to open the Contacts app. This will open the app in its last manual
-        state. This is the state that has been explicitly set by the user (e.g. by clicking a tab).
-        States configured via other Intents (e.g. CallLog after Call) are not considered manual
-        state. At the moment, the Intent always goes to the DialtactsActivity, but this might later
-        be changed to also include sub-activities like Edit or View if they were left open -->
-
-        <activity-alias android:name="ContactsLaunchActivity"
-            android:targetActivity="DialtactsActivity"
-        >
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-            </intent-filter>
-        </activity-alias>
-
-        <!-- An empty activity that presents the DialtactActivity's Favorites tab -->
-        <activity-alias android:name="DialtactsFavoritesEntryActivity"
-            android:targetActivity="DialtactsActivity"
-        >
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity-alias>
-
-        <!-- The actual list of contacts, usually embedded in ContactsActivity -->
-        <activity android:name="ContactsListActivity"
-            android:label="@string/contactsList"
-            android:clearTaskOnLaunch="true"
-        >
-            <intent-filter>
-                <action android:name="com.android.contacts.action.LIST_DEFAULT" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.TAB" />
-            </intent-filter>
-
-            <intent-filter>
-                <action android:name="com.android.contacts.action.LIST_CONTACTS" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.TAB" />
-            </intent-filter>
-
-            <intent-filter>
-                <action android:name="com.android.contacts.action.LIST_ALL_CONTACTS" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.TAB" />
-            </intent-filter>
-
-            <intent-filter>
-                <action android:name="com.android.contacts.action.LIST_CONTACTS_WITH_PHONES" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.TAB" />
-            </intent-filter>
-
-            <intent-filter android:label="@string/starredList">
-                <action android:name="com.android.contacts.action.LIST_STARRED" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.TAB" />
-            </intent-filter>
-
-            <intent-filter android:label="@string/frequentList">
-                <action android:name="com.android.contacts.action.LIST_FREQUENT" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.TAB" />
-            </intent-filter>
-
-            <intent-filter android:label="@string/strequentList">
-                <action android:name="com.android.contacts.action.LIST_STREQUENT" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.TAB" />
-            </intent-filter>
-
-            <intent-filter>
-                <action android:name="android.intent.action.INSERT_OR_EDIT" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="vnd.android.cursor.item/person" />
-                <data android:mimeType="vnd.android.cursor.item/contact" />
-                <data android:mimeType="vnd.android.cursor.item/raw_contact" />
-            </intent-filter>
-
-            <intent-filter>
-                <action android:name="android.intent.action.PICK" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="vnd.android.cursor.dir/contact" android:host="com.android.contacts" />
-                <data android:mimeType="vnd.android.cursor.dir/person" android:host="contacts" />
-                <data android:mimeType="vnd.android.cursor.dir/phone_v2" android:host="com.android.contacts" />
-                <data android:mimeType="vnd.android.cursor.dir/phone" android:host="contacts" />
-                <data android:mimeType="vnd.android.cursor.dir/postal-address_v2" android:host="com.android.contacts" />
-                <data android:mimeType="vnd.android.cursor.dir/postal-address" android:host="contacts" />
-            </intent-filter>
-
-            <intent-filter>
-                <action android:name="android.intent.action.GET_CONTENT" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="vnd.android.cursor.item/contact" android:host="com.android.contacts" />
-                <data android:mimeType="vnd.android.cursor.item/person" android:host="contacts" />
-                <data android:mimeType="vnd.android.cursor.item/phone_v2" android:host="com.android.contacts" />
-                <data android:mimeType="vnd.android.cursor.item/phone" android:host="contacts" />
-                <data android:mimeType="vnd.android.cursor.item/postal-address_v2" android:host="com.android.contacts" />
-                <data android:mimeType="vnd.android.cursor.item/postal-address" android:host="contacts" />
-            </intent-filter>
-
-        </activity>
-
-        <!-- An activity for joining contacts -->
-        <activity android:name="ContactsListActivity$JoinContactActivity"
-            android:theme="@style/TallTitleBarTheme"
-            android:clearTaskOnLaunch="true"
-        >
-            <intent-filter>
-                <action android:name="com.android.contacts.action.JOIN_AGGREGATE" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
-
-        <!-- The contacts search/filter UI -->
-        <activity android:name="ContactsListActivity$ContactsSearchActivity"
-            android:theme="@style/ContactsSearchTheme"
-            android:windowSoftInputMode="stateAlwaysVisible|adjustPan"
-        >
-            <intent-filter>
-                <action android:name="com.android.contacts.action.FILTER_CONTACTS" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="vnd.android.cursor.dir/contact" android:host="com.android.contacts" />
-            </intent-filter>
-        </activity>
-
-        <!-- The contacts search/filter UI -->
-        <activity android:name="SearchResultsActivity"
-            android:theme="@style/TallTitleBarTheme"
-            android:label="@string/contactsList"
-        >
-            <intent-filter>
-                <action android:name="android.intent.action.SEARCH" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-
-            <meta-data android:name="android.app.searchable"
-                android:resource="@xml/searchable"
-            />
-        </activity>
-
-        <!-- Used to select display and sync groups -->
-        <activity android:name=".ui.ContactsPreferencesActivity" android:label="@string/displayGroups" />
-
-        <activity
-            android:name=".ui.ShowOrCreateActivity"
-            android:theme="@style/FullyTranslucent">
-
-            <intent-filter>
-                <action android:name="com.android.contacts.action.SHOW_OR_CREATE_CONTACT" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:scheme="mailto" />
-                <data android:scheme="tel" />
-            </intent-filter>
-        </activity>
-
-        <!-- Used to show QuickContact window over a translucent activity, which is a
-             temporary hack until we add better framework support. -->
-        <activity
-            android:name=".ui.QuickContactActivity"
-            android:theme="@style/FullyTranslucent.QuickContact"
-            android:launchMode="singleTop"
-            android:excludeFromRecents="true"
-            android:taskAffinity="android.task.quickcontact"
-            android:windowSoftInputMode="stateUnchanged"
-            >
-
-            <intent-filter>
-                <action android:name="com.android.contacts.action.QUICK_CONTACT" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="vnd.android.cursor.item/contact" android:host="com.android.contacts" />
-                <data android:mimeType="vnd.android.cursor.item/person" android:host="contacts" />
-            </intent-filter>
-        </activity>
-
-        <activity-alias android:name="ContactShortcut"
-            android:targetActivity="ContactsListActivity"
-            android:label="@string/shortcutContact"
-            android:icon="@drawable/ic_launcher_shortcut_contact">
-
-            <intent-filter>
-                <action android:name="android.intent.action.CREATE_SHORTCUT" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-
-        </activity-alias>
-
-        <activity-alias android:name="alias.DialShortcut"
-            android:targetActivity="ContactsListActivity"
-            android:label="@string/shortcutDialContact"
-            android:icon="@drawable/ic_launcher_shortcut_directdial">
-
-            <intent-filter>
-                <action android:name="android.intent.action.CREATE_SHORTCUT" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.CAR_MODE" />
-            </intent-filter>
-
-        </activity-alias>
-
-        <activity-alias android:name="alias.MessageShortcut"
-            android:targetActivity="ContactsListActivity"
-            android:label="@string/shortcutMessageContact"
-            android:icon="@drawable/ic_launcher_shortcut_directmessage">
-
-            <intent-filter>
-                <action android:name="android.intent.action.CREATE_SHORTCUT" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-
-        </activity-alias>
-
-        <activity android:name="CallDetailActivity"
-            android:label="@string/callDetailTitle"
-            android:theme="@style/TallTitleBarTheme"
-        >
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="vnd.android.cursor.item/calls" />
-            </intent-filter>
-        </activity>
-
-        <!-- Views the details of a single contact -->
-        <activity android:name="ViewContactActivity"
-            android:label="@string/viewContactTitle"
-            android:theme="@style/TallTitleBarTheme">
-
-            <intent-filter android:label="@string/viewContactDesription">
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="vnd.android.cursor.item/person" android:host="contacts" />
-                <data android:mimeType="vnd.android.cursor.item/contact" android:host="com.android.contacts" />
-                <data android:mimeType="vnd.android.cursor.item/raw_contact" android:host="com.android.contacts" />
-            </intent-filter>
-        </activity>
-
-        <!-- Edit or insert details for a contact -->
-        <activity
-            android:name=".ui.EditContactActivity"
-            android:windowSoftInputMode="stateHidden|adjustResize">
-
-            <intent-filter android:label="@string/editContactDescription">
-                <action android:name="android.intent.action.EDIT" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="vnd.android.cursor.item/person" android:host="contacts" />
-                <data android:mimeType="vnd.android.cursor.item/contact" android:host="com.android.contacts" />
-                <data android:mimeType="vnd.android.cursor.item/raw_contact" android:host="com.android.contacts" />
-            </intent-filter>
-
-            <intent-filter android:label="@string/insertContactDescription">
-                <action android:name="android.intent.action.INSERT" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="vnd.android.cursor.dir/person" />
-                <data android:mimeType="vnd.android.cursor.dir/contact" />
-                <data android:mimeType="vnd.android.cursor.dir/raw_contact" />
-            </intent-filter>
-
-        </activity>
-
-        <!-- Stub service used to keep our process alive long enough for
-             background threads to finish their operations. -->
-        <service
-            android:name=".util.EmptyService"
-            android:exported="false" />
-
-        <!-- Views the details of a single contact -->
-        <activity android:name="ContactOptionsActivity"
-            android:label="@string/contactOptionsTitle"
-        >
-            <intent-filter>
-                <action android:name="android.intent.action.EDIT" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
-
-        <!-- Attaches a photo to a contact. Started from external applications -->
-        <activity android:name="AttachImage"
-            android:label="@string/attachToContact"
-            android:taskAffinity="">
-            <intent-filter>
-                <action android:name="android.intent.action.ATTACH_DATA" />
-                <data android:mimeType="image/*" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-            />
-        </activity>
-
-        <!-- Makes .ContactsListActivity the search target for any activity in Contacts -->
-        <meta-data
-            android:name="android.app.default_searchable"
-            android:value=".ContactsListActivity" />
-
-
-        <!-- LIVE FOLDERS -->
-        <activity
-            android:name=".ContactsLiveFolders$AllContacts"
-            android:label="@string/liveFolderAll"
-            android:icon="@drawable/ic_launcher_folder_live_contacts">
-            <intent-filter>
-                <action android:name="android.intent.action.CREATE_LIVE_FOLDER" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
-
-        <activity
-            android:name=".ContactsLiveFolders$StarredContacts"
-            android:label="@string/liveFolderFavorites"
-            android:icon="@drawable/ic_launcher_folder_live_contacts_starred">
-            <intent-filter>
-                <action android:name="android.intent.action.CREATE_LIVE_FOLDER" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
-
-        <activity
-            android:name=".ContactsLiveFolders$PhoneContacts"
-            android:label="@string/liveFolderPhone"
-            android:icon="@drawable/ic_launcher_folder_live_contacts_phone">
-            <intent-filter>
-                <action android:name="android.intent.action.CREATE_LIVE_FOLDER" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name=".ImportVCardActivity"
-            android:theme="@style/BackgroundOnly">
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-                <data android:mimeType="text/directory" />
-                <data android:mimeType="text/x-vcard" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name=".ExportVCardActivity"
-            android:theme="@style/BackgroundOnly" />
-
-            <!-- Wysie_Soh: Custom Intents -->
-        <activity android:name="ContactsPreferences">
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
-
-    </application>
-</manifest>
diff --git a/overlay/speedy/frameworks/base/core/res/res/values/config.xml b/overlay/speedy/frameworks/base/core/res/res/values/config.xml
deleted file mode 100644
index 960a389..0000000
--- a/overlay/speedy/frameworks/base/core/res/res/values/config.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2011, The CyanogenMod Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<resources>
-
-    <!-- Component name of the default wallpaper. This will be ImageWallpaper if not
-         specified -->
-    <string name="default_wallpaper_component">com.android.wallpaper/.nexus.NexusWallpaper</string>
-
-</resources>
diff --git a/overlay/speedy/packages/apps/CMParts/res/values/config.xml b/overlay/speedy/packages/apps/CMParts/res/values/config.xml
deleted file mode 100644
index 0171a73..0000000
--- a/overlay/speedy/packages/apps/CMParts/res/values/config.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- Whether or not to display the trackball settings -->
-    <bool name="has_trackball">false</bool>
-    <bool name="has_rgb_notification_led">false</bool>
-    <bool name="has_camera_button">false</bool>
-    <bool name="has_led_flash">true</bool>
-</resources>
diff --git a/overlay/speedy/packages/apps/Camera/res/values/config.xml b/overlay/speedy/packages/apps/Camera/res/values/config.xml
deleted file mode 100644
index 2cba641..0000000
--- a/overlay/speedy/packages/apps/Camera/res/values/config.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2011, The CyanogenMod Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- These resources are around just to allow their values to be customized
-     for different hardware and product builds. -->
-<resources>
-        <string name="filtered_pictureSizes">2592x1936</string>
-</resources>
-
diff --git a/overlay/star/frameworks/base/core/res/res/values/config.xml b/overlay/star/frameworks/base/core/res/res/values/config.xml
deleted file mode 100644
index 960a389..0000000
--- a/overlay/star/frameworks/base/core/res/res/values/config.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2011, The CyanogenMod Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<resources>
-
-    <!-- Component name of the default wallpaper. This will be ImageWallpaper if not
-         specified -->
-    <string name="default_wallpaper_component">com.android.wallpaper/.nexus.NexusWallpaper</string>
-
-</resources>
diff --git a/overlay/star/packages/apps/CMParts/res/values/config.xml b/overlay/star/packages/apps/CMParts/res/values/config.xml
deleted file mode 100644
index 0171a73..0000000
--- a/overlay/star/packages/apps/CMParts/res/values/config.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- Whether or not to display the trackball settings -->
-    <bool name="has_trackball">false</bool>
-    <bool name="has_rgb_notification_led">false</bool>
-    <bool name="has_camera_button">false</bool>
-    <bool name="has_led_flash">true</bool>
-</resources>
diff --git a/overlay/supersonic/packages/apps/CMParts/res/values/config.xml b/overlay/supersonic/packages/apps/CMParts/res/values/config.xml
deleted file mode 100644
index 35b645a..0000000
--- a/overlay/supersonic/packages/apps/CMParts/res/values/config.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- Whether or not to display the trackball settings -->
-    <bool name="has_trackball">false</bool>
-    <bool name="has_rgb_notification_led">false</bool>
-    <bool name="has_dual_notification_led">true</bool>
-
-    <bool name="has_led_flash">true</bool>
-</resources>
diff --git a/overlay/supersonic/packages/apps/Camera/res/values/config.xml b/overlay/supersonic/packages/apps/Camera/res/values/config.xml
deleted file mode 100644
index 35f3cef..0000000
--- a/overlay/supersonic/packages/apps/Camera/res/values/config.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2011, The CyanogenMod Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- These resources are around just to allow their values to be customized
-     for different hardware and product builds. -->
-<resources>
-        <!-- FFC parameter filtering -->
-        <bool name="ffc_canFocus">false</bool>
-        <bool name="ffc_canZoom">false</bool>
-        <string name="ffc_supportedEffects">none,mono,sepia</string>
-</resources>
-
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/jog_dial_arrow_long_left_green.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/jog_dial_arrow_long_left_green.png
deleted file mode 100755
index a418a61..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/jog_dial_arrow_long_left_green.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/jog_dial_arrow_long_left_yellow.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/jog_dial_arrow_long_left_yellow.png
deleted file mode 100755
index 933c4b6..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/jog_dial_arrow_long_left_yellow.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/jog_dial_arrow_long_right_red.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/jog_dial_arrow_long_right_red.png
deleted file mode 100755
index b59b063..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/jog_dial_arrow_long_right_red.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/jog_dial_arrow_long_right_yellow.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/jog_dial_arrow_long_right_yellow.png
deleted file mode 100755
index 3dfeee7..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/jog_dial_arrow_long_right_yellow.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/jog_dial_arrow_short_down_green.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/jog_dial_arrow_short_down_green.png
deleted file mode 100755
index 5d0ed08..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/jog_dial_arrow_short_down_green.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/jog_dial_bg.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/jog_dial_bg.png
deleted file mode 100755
index 6862e2e..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/jog_dial_bg.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/jog_dial_bg_rev.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/jog_dial_bg_rev.png
deleted file mode 100755
index 6862e2e..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/jog_dial_bg_rev.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/jog_dial_bg_rev_down.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/jog_dial_bg_rev_down.png
deleted file mode 100755
index ad6bb62..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/jog_dial_bg_rev_down.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/lense_square_bg.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/lense_square_bg.png
deleted file mode 100755
index 4ce34cd..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/lense_square_bg.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_ecb_mode.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_ecb_mode.png
deleted file mode 100644
index 91e6c1e..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_ecb_mode.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_notify_call_mute.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_notify_call_mute.png
deleted file mode 100644
index 2464f1e..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_notify_call_mute.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_notify_car_mode.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_notify_car_mode.png
deleted file mode 100644
index e700d79..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_notify_car_mode.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_notify_chat.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_notify_chat.png
deleted file mode 100644
index 4cbcbdb..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_notify_chat.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_notify_disk_full.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_notify_disk_full.png
deleted file mode 100644
index 8d69174..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_notify_disk_full.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_notify_email_generic.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_notify_email_generic.png
deleted file mode 100644
index bc5fcab..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_notify_email_generic.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_notify_error.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_notify_error.png
deleted file mode 100644
index 0462aca..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_notify_error.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_notify_gmail.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_notify_gmail.png
deleted file mode 100644
index ea8beae..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_notify_gmail.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_notify_missed_call.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_notify_missed_call.png
deleted file mode 100644
index 3c19c93..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_notify_missed_call.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_notify_more.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_notify_more.png
deleted file mode 100644
index c1cde9c..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_notify_more.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_notify_sdcard.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_notify_sdcard.png
deleted file mode 100644
index e77086a..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_notify_sdcard.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_notify_sdcard_prepare.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_notify_sdcard_prepare.png
deleted file mode 100644
index 654e769..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_notify_sdcard_prepare.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_notify_sdcard_usb.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_notify_sdcard_usb.png
deleted file mode 100644
index 78037fd..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_notify_sdcard_usb.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_notify_sim_toolkit.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_notify_sim_toolkit.png
deleted file mode 100644
index fcdd917..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_notify_sim_toolkit.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_notify_sync.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_notify_sync.png
deleted file mode 100644
index bfb8110..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_notify_sync.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_notify_sync_anim0.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_notify_sync_anim0.png
deleted file mode 100644
index d3d4d78..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_notify_sync_anim0.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_notify_sync_error.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_notify_sync_error.png
deleted file mode 100644
index b340a31..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_notify_sync_error.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_notify_voicemail.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_notify_voicemail.png
deleted file mode 100644
index a615ec8..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_notify_voicemail.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_notify_wifi_in_range.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_notify_wifi_in_range.png
deleted file mode 100644
index 76034e5..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_notify_wifi_in_range.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_adb.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_adb.png
deleted file mode 100755
index f99b780..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_adb.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_battery_0.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_battery_0.png
deleted file mode 100644
index 572e0d3..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_battery_0.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_battery_10.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_battery_10.png
deleted file mode 100755
index c9d9436..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_battery_10.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_battery_100.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_battery_100.png
deleted file mode 100755
index 754cdf6..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_battery_100.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_battery_15.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_battery_15.png
deleted file mode 100644
index 0b9bed8..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_battery_15.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_battery_20.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_battery_20.png
deleted file mode 100755
index c22fead..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_battery_20.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_battery_25.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_battery_25.png
deleted file mode 100644
index 7c7030a..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_battery_25.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_battery_30.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_battery_30.png
deleted file mode 100644
index d0342df..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_battery_30.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_battery_35.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_battery_35.png
deleted file mode 100644
index 00190ab..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_battery_35.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_battery_40.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_battery_40.png
deleted file mode 100755
index ced08cd..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_battery_40.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_battery_45.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_battery_45.png
deleted file mode 100644
index 8f60486..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_battery_45.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_battery_5.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_battery_5.png
deleted file mode 100644
index d9c6135..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_battery_5.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_battery_50.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_battery_50.png
deleted file mode 100644
index ff0ef0d..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_battery_50.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_battery_55.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_battery_55.png
deleted file mode 100644
index 3f7581d..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_battery_55.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_battery_60.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_battery_60.png
deleted file mode 100755
index 359d65e..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_battery_60.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_battery_65.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_battery_65.png
deleted file mode 100644
index b3dc834..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_battery_65.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_battery_70.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_battery_70.png
deleted file mode 100644
index 4995289..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_battery_70.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_battery_75.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_battery_75.png
deleted file mode 100644
index 011f82e..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_battery_75.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_battery_80.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_battery_80.png
deleted file mode 100755
index 24b32c1..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_battery_80.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_battery_85.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_battery_85.png
deleted file mode 100644
index 2be76e0..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_battery_85.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_battery_90.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_battery_90.png
deleted file mode 100644
index 74c3e49..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_battery_90.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_battery_95.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_battery_95.png
deleted file mode 100644
index 2cac442..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_battery_95.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_battery_charge_anim0.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_battery_charge_anim0.png
deleted file mode 100755
index 061bd2a..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_battery_charge_anim0.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_battery_charge_anim1.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_battery_charge_anim1.png
deleted file mode 100755
index 895ade2..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_battery_charge_anim1.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_battery_charge_anim2.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_battery_charge_anim2.png
deleted file mode 100755
index ba57679..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_battery_charge_anim2.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_battery_charge_anim3.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_battery_charge_anim3.png
deleted file mode 100755
index 85f461a..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_battery_charge_anim3.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_battery_charge_anim4.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_battery_charge_anim4.png
deleted file mode 100755
index 4766067..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_battery_charge_anim4.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_battery_charge_anim5.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_battery_charge_anim5.png
deleted file mode 100755
index 8708473..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_battery_charge_anim5.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_battery_unknown.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_battery_unknown.png
deleted file mode 100755
index 9d65883..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_battery_unknown.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_data_bluetooth.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_data_bluetooth.png
deleted file mode 100644
index 520c32d..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_data_bluetooth.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_data_usb.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_data_usb.png
deleted file mode 100644
index 25f008f..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_data_usb.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_download_anim0.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_download_anim0.png
deleted file mode 100644
index 7615a68..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_download_anim0.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_download_anim1.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_download_anim1.png
deleted file mode 100644
index 51bba40..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_download_anim1.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_download_anim2.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_download_anim2.png
deleted file mode 100644
index 2f5af54..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_download_anim2.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_download_anim3.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_download_anim3.png
deleted file mode 100644
index 084e06c..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_download_anim3.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_download_anim4.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_download_anim4.png
deleted file mode 100644
index c198688..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_download_anim4.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_download_anim5.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_download_anim5.png
deleted file mode 100644
index 0dcfcef..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_download_anim5.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_gps_on.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_gps_on.png
deleted file mode 100644
index 2ed6082..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_gps_on.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_headset.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_headset.png
deleted file mode 100644
index 8aa4047..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_headset.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_phone_call.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_phone_call.png
deleted file mode 100644
index fe32b91..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_phone_call.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_phone_call_forward.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_phone_call_forward.png
deleted file mode 100644
index 39b8b16..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_phone_call_forward.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_phone_call_on_hold.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_phone_call_on_hold.png
deleted file mode 100644
index c4ecd5d..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_phone_call_on_hold.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_r_signal_0_cdma.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_r_signal_0_cdma.png
deleted file mode 100644
index c44f0c5..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_r_signal_0_cdma.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_r_signal_1_cdma.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_r_signal_1_cdma.png
deleted file mode 100644
index 963ee8a..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_r_signal_1_cdma.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_r_signal_2_cdma.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_r_signal_2_cdma.png
deleted file mode 100644
index da056be..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_r_signal_2_cdma.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_r_signal_3_cdma.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_r_signal_3_cdma.png
deleted file mode 100644
index f7b0499..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_r_signal_3_cdma.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_r_signal_4_cdma.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_r_signal_4_cdma.png
deleted file mode 100644
index deec37d..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_r_signal_4_cdma.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_ra_signal_0_cdma.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_ra_signal_0_cdma.png
deleted file mode 100644
index d09a03d..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_ra_signal_0_cdma.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_ra_signal_1_cdma.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_ra_signal_1_cdma.png
deleted file mode 100644
index d6ddcb9..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_ra_signal_1_cdma.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_ra_signal_2_cdma.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_ra_signal_2_cdma.png
deleted file mode 100644
index 6ed05da..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_ra_signal_2_cdma.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_ra_signal_3_cdma.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_ra_signal_3_cdma.png
deleted file mode 100644
index 1969054..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_ra_signal_3_cdma.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_ra_signal_4_cdma.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_ra_signal_4_cdma.png
deleted file mode 100644
index 649274e..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_ra_signal_4_cdma.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_secure.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_secure.png
deleted file mode 100644
index 4dfb50b..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_secure.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_signal_0_cdma.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_signal_0_cdma.png
deleted file mode 100755
index af43e00..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_signal_0_cdma.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_signal_1_cdma.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_signal_1_cdma.png
deleted file mode 100755
index 4ffe421..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_signal_1_cdma.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_signal_2_cdma.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_signal_2_cdma.png
deleted file mode 100755
index 6f27b96..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_signal_2_cdma.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_signal_3_cdma.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_signal_3_cdma.png
deleted file mode 100755
index ddc46b0..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_signal_3_cdma.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_signal_4_cdma.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_signal_4_cdma.png
deleted file mode 100755
index fb3cfe9..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_signal_4_cdma.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_signal_evdo_0.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_signal_evdo_0.png
deleted file mode 100755
index b697ca4..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_signal_evdo_0.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_signal_evdo_1.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_signal_evdo_1.png
deleted file mode 100755
index a61de4d..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_signal_evdo_1.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_signal_evdo_2.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_signal_evdo_2.png
deleted file mode 100755
index 62e0393..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_signal_evdo_2.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_signal_evdo_3.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_signal_evdo_3.png
deleted file mode 100755
index 09eae9d..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_signal_evdo_3.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_signal_evdo_4.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_signal_evdo_4.png
deleted file mode 100755
index 4012ac5..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_signal_evdo_4.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_speakerphone.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_speakerphone.png
deleted file mode 100644
index 2564d3d..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_speakerphone.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_tether_bluetooth.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_tether_bluetooth.png
deleted file mode 100644
index 6cd8a41..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_tether_bluetooth.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_tether_general.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_tether_general.png
deleted file mode 100644
index 12f5aad..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_tether_general.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_tether_usb.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_tether_usb.png
deleted file mode 100644
index 3db5bd4..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_tether_usb.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_tether_wifi.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_tether_wifi.png
deleted file mode 100644
index aeb668b..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_tether_wifi.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_throttled.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_throttled.png
deleted file mode 100644
index 6fd0c8a..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_throttled.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_upload_anim0.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_upload_anim0.png
deleted file mode 100644
index 116aaf2..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_upload_anim0.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_upload_anim1.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_upload_anim1.png
deleted file mode 100644
index 9921d5e..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_upload_anim1.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_upload_anim2.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_upload_anim2.png
deleted file mode 100644
index f771f9e..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_upload_anim2.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_upload_anim3.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_upload_anim3.png
deleted file mode 100644
index 3fea2c6..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_upload_anim3.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_upload_anim4.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_upload_anim4.png
deleted file mode 100644
index ecbaa18..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_upload_anim4.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_upload_anim5.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_upload_anim5.png
deleted file mode 100644
index 3b0550d..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_upload_anim5.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_vp_phone_call.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_vp_phone_call.png
deleted file mode 100644
index 7992d07..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_vp_phone_call.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_vp_phone_call_on_hold.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_vp_phone_call_on_hold.png
deleted file mode 100644
index 783054a..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_vp_phone_call_on_hold.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_warning.png b/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_warning.png
deleted file mode 100644
index a4862a8..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/drawable-mdpi/stat_sys_warning.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/values-de/strings.xml b/overlay/tablet/frameworks/base/core/res/res/values-de/strings.xml
deleted file mode 100644
index 84c41b6..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/values-de/strings.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="lockscreen_carrier_default"></string>
-    <string name="power_dialog">Tabletoptionen</string>
-    <string name="reboot_system">Neu starten</string>
-    <string name="shutdown_confirm">Tablet wird heruntergefahren.</string>
-    <string name="reboot_confirm">Ihr Tablet wird neu gestartet.</string>
-    <string name="global_actions">Tabletoptionen</string>
-</resources>
diff --git a/overlay/tablet/frameworks/base/core/res/res/values-it/strings.xml b/overlay/tablet/frameworks/base/core/res/res/values-it/strings.xml
deleted file mode 100644
index f436bec..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/values-it/strings.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2009, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- On the keyguard screen, it shows the carrier the phone is connected to.  This is displayed if the phone is not connected to a carrier.-->
-    <string name="lockscreen_carrier_default"></string>
-
-    <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
-    <string name="power_dialog">Opzioni tablet</string>
-
-    <!-- Button to reboot the phone, within the Phone Options dialog -->
-    <string name="reboot_system">Riavvia tablet</string>
-
-    <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the phone, there will be a confirmation dialog.  This is the message. -->
-    <string name="shutdown_confirm">Il tablet verrà spento.</string>
-
-    <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the phone, there will be a confirmation dialog.  This is the message. -->
-    <string name="reboot_confirm">Il tablet verrà riavviato.</string>
-
-    <!-- Title of the Global Actions Dialog -->
-    <string name="global_actions">Opzioni tablet</string>
-</resources>
diff --git a/overlay/tablet/frameworks/base/core/res/res/values-pt/strings.xml b/overlay/tablet/frameworks/base/core/res/res/values-pt/strings.xml
deleted file mode 100755
index debe393..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/values-pt/strings.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="power_dialog">Configurações do tablet</string>
-    <string name="reboot_system">Reiniciar tablet</string>
-    <string name="shutdown_confirm">Seu tablet irá desligar.</string>
-    <string name="reboot_confirm">Seu tablet irá reiniciar.</string>
-    <string name="global_actions">Configurações do tablet</string>
-</resources>
diff --git a/overlay/tablet/frameworks/base/core/res/res/values-ru/strings.xml b/overlay/tablet/frameworks/base/core/res/res/values-ru/strings.xml
deleted file mode 100644
index 61a9d3b..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/values-ru/strings.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2009, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- On the keyguard screen, it shows the carrier the phone is connected to.  This is displayed if the phone is not connected to a carrier.-->
-         <string name="lockscreen_carrier_default"></string>
-
-    <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
-    <string name="power_dialog">Параметры планшетного ПК</string>
-
-    <!-- Button to reboot the phone, within the Phone Options dialog -->
-    <string name="reboot_system">Перезагрузить</string>
-
-    <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the phone, there will be a confirmation dialog.  This is the message. -->
-    <string name="shutdown_confirm">Планшетный ПК будет выключен.</string>
-
-    <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the phone, there will be a confirmation dialog.  This is the message. -->
-    <string name="reboot_confirm">Планшетный ПК будет перезагружен.</string>
-
-    <!-- Title of the Global Actions Dialog -->
-    <string name="global_actions">Параметры планшетного ПК</string>
-</resources>
diff --git a/overlay/tablet/frameworks/base/core/res/res/values-zh-rTW/strings.xml b/overlay/tablet/frameworks/base/core/res/res/values-zh-rTW/strings.xml
deleted file mode 100644
index 1c24780..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/values-zh-rTW/strings.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2009, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- On the keyguard screen, it shows the carrier the phone is connected to.  This is displayed if the phone is not connected to a carrier.-->
-    <string name="lockscreen_carrier_default"></string>
-
-    <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
-    <string name="power_dialog">平板選項</string>
-
-    <!-- Button to reboot the phone, within the Phone Options dialog -->
-    <string name="reboot_system">重新啟動平板</string>
-
-    <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the phone, there will be a confirmation dialog.  This is the message. -->
-    <string name="shutdown_confirm">平板即將關機。</string>
-
-    <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the phone, there will be a confirmation dialog.  This is the message. -->
-    <string name="reboot_confirm">平板即將重新啟動。</string>
-
-    <!-- Title of the Global Actions Dialog -->
-    <string name="global_actions">平板選項</string>
-</resources>
diff --git a/overlay/tablet/frameworks/base/core/res/res/values/dimens.xml b/overlay/tablet/frameworks/base/core/res/res/values/dimens.xml
deleted file mode 100644
index e6560d9..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/values/dimens.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/apps/common/assets/res/any/dimens.xml
-**
-** Copyright 2006, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<resources>
-    <!-- Height of the status bar -->
-    <dimen name="status_bar_height">35dip</dimen>
-    <!-- Height of the status bar -->
-    <dimen name="status_bar_icon_size">35dip</dimen>
-</resources>
diff --git a/overlay/tablet/frameworks/base/core/res/res/values/strings.xml b/overlay/tablet/frameworks/base/core/res/res/values/strings.xml
deleted file mode 100644
index b1c129d..0000000
--- a/overlay/tablet/frameworks/base/core/res/res/values/strings.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2009, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- On the keyguard screen, it shows the carrier the phone is connected to.  This is displayed if the phone is not connected to a carrier.-->
-    <string name="lockscreen_carrier_default"></string>
-
-    <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
-    <string name="power_dialog">Tablet options</string>
-
-    <!-- Button to reboot the phone, within the Phone Options dialog -->
-    <string name="reboot_system">Reboot Tablet</string>
-
-    <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the phone, there will be a confirmation dialog.  This is the message. -->
-    <string name="shutdown_confirm">Your tablet will shut down.</string>
-
-    <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the phone, there will be a confirmation dialog.  This is the message. -->
-    <string name="reboot_confirm">Your tablet will reboot.</string>
-
-    <!-- Title of the Global Actions Dialog -->
-    <string name="global_actions">Tablet options</string>
-</resources>
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_2g3g_off.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_2g3g_off.png
deleted file mode 100755
index 6db10ef..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_2g3g_off.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_2g3g_on.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_2g3g_on.png
deleted file mode 100755
index 366404b..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_2g3g_on.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_3g_on.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_3g_on.png
deleted file mode 100755
index 5e19fd2..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_3g_on.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_airplane_off.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_airplane_off.png
deleted file mode 100755
index 9312868..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_airplane_off.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_airplane_on.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_airplane_on.png
deleted file mode 100755
index 7ed1ac3..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_airplane_on.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_bgoff.9.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_bgoff.9.png
deleted file mode 100644
index e288cb2..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_bgoff.9.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_bgon.9.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_bgon.9.png
deleted file mode 100644
index b27a5cb..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_bgon.9.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_bgon_custom.9.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_bgon_custom.9.png
deleted file mode 100644
index 3c1439b..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_bgon_custom.9.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_bluetooth_off.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_bluetooth_off.png
deleted file mode 100755
index a45acbb..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_bluetooth_off.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_bluetooth_on.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_bluetooth_on.png
deleted file mode 100755
index 94f03e9..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_bluetooth_on.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_brightness_auto.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_brightness_auto.png
deleted file mode 100755
index 417a4a7..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_brightness_auto.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_brightness_mid.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_brightness_mid.png
deleted file mode 100755
index 937bfa1..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_brightness_mid.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_brightness_off.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_brightness_off.png
deleted file mode 100755
index 10f1e12..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_brightness_off.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_brightness_on.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_brightness_on.png
deleted file mode 100755
index 8b22698..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_brightness_on.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_data_off.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_data_off.png
deleted file mode 100755
index 3bf48e0..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_data_off.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_data_on.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_data_on.png
deleted file mode 100755
index 8f15204..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_data_on.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_flashlight_off.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_flashlight_off.png
deleted file mode 100755
index b6f48e1..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_flashlight_off.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_flashlight_on.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_flashlight_on.png
deleted file mode 100755
index fe73b22..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_flashlight_on.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_gps_off.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_gps_off.png
deleted file mode 100755
index 34c2164..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_gps_off.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_gps_on.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_gps_on.png
deleted file mode 100755
index 6bd0e64..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_gps_on.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_ing_off.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_ing_off.png
deleted file mode 100755
index 80a196c..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_ing_off.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_inner_focus.9.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_inner_focus.9.png
deleted file mode 100644
index ed79969..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_inner_focus.9.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_inner_press.9.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_inner_press.9.png
deleted file mode 100644
index b1b6cab..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_inner_press.9.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_lock_screen_off.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_lock_screen_off.png
deleted file mode 100755
index e484e10..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_lock_screen_off.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_lock_screen_on.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_lock_screen_on.png
deleted file mode 100755
index 67d02dd..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_lock_screen_on.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_media_next.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_media_next.png
deleted file mode 100755
index 2a50952..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_media_next.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_media_pause.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_media_pause.png
deleted file mode 100755
index 814b97b..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_media_pause.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_media_play.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_media_play.png
deleted file mode 100755
index dc95df0..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_media_play.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_media_previous.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_media_previous.png
deleted file mode 100755
index f2163db..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_media_previous.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_notify_alarm.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_notify_alarm.png
deleted file mode 100644
index 2d3eb30..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_notify_alarm.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_notify_more.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_notify_more.png
deleted file mode 100755
index 1c7f9db..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_notify_more.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_orientation_off.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_orientation_off.png
deleted file mode 100755
index fed7fff..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_orientation_off.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_orientation_on.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_orientation_on.png
deleted file mode 100755
index 4991bbe..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_orientation_on.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_power_background.9.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_power_background.9.png
deleted file mode 100755
index 3204d1d..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_power_background.9.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_ring_on.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_ring_on.png
deleted file mode 100755
index ca4cdb2..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_ring_on.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_ring_vibrate_on.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_ring_vibrate_on.png
deleted file mode 100755
index bae1a9e..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_ring_vibrate_on.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_screen_timeout_off.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_screen_timeout_off.png
deleted file mode 100755
index f4ae52c..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_screen_timeout_off.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_screen_timeout_on.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_screen_timeout_on.png
deleted file mode 100755
index 9efcc73..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_screen_timeout_on.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_silent.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_silent.png
deleted file mode 100755
index d8107f3..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_silent.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sleep.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sleep.png
deleted file mode 100755
index 9c3de06..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sleep.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sync_off.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sync_off.png
deleted file mode 100755
index 1da382f..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sync_off.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sync_on.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sync_on.png
deleted file mode 100755
index 06c6c5d..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sync_on.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_bluetooth.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_bluetooth.png
deleted file mode 100644
index e8fbc9e..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_bluetooth.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_bluetooth_connected.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_bluetooth_connected.png
deleted file mode 100644
index 18c77df..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_bluetooth_connected.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_connected_1x.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_connected_1x.png
deleted file mode 100644
index 818e292..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_connected_1x.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_connected_3g.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_connected_3g.png
deleted file mode 100644
index 95866b1..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_connected_3g.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_connected_e.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_connected_e.png
deleted file mode 100644
index 016b30b..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_connected_e.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_connected_g.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_connected_g.png
deleted file mode 100644
index ec672eb..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_connected_g.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_connected_h.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_connected_h.png
deleted file mode 100755
index 27bab73..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_connected_h.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_connected_1x.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_connected_1x.png
deleted file mode 100644
index 0e6849b..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_connected_1x.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_connected_3g.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_connected_3g.png
deleted file mode 100644
index a86a324..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_connected_3g.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_connected_e.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_connected_e.png
deleted file mode 100644
index 24902d6..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_connected_e.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_connected_g.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_connected_g.png
deleted file mode 100644
index 4160a95..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_connected_g.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_connected_h.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_connected_h.png
deleted file mode 100644
index d459ee3..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_connected_h.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_in_1x.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_in_1x.png
deleted file mode 100644
index 7b64751..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_in_1x.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_in_3g.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_in_3g.png
deleted file mode 100644
index d82930c..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_in_3g.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_in_e.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_in_e.png
deleted file mode 100755
index 8096846..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_in_e.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_in_g.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_in_g.png
deleted file mode 100644
index e94e146..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_in_g.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_in_h.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_in_h.png
deleted file mode 100644
index 8805a40..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_in_h.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_inandout_1x.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_inandout_1x.png
deleted file mode 100644
index 07545d5..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_inandout_1x.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_inandout_3g.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_inandout_3g.png
deleted file mode 100644
index 7629cef..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_inandout_3g.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_inandout_e.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_inandout_e.png
deleted file mode 100644
index 28578c6..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_inandout_e.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_inandout_g.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_inandout_g.png
deleted file mode 100644
index d9f7a30..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_inandout_g.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_inandout_h.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_inandout_h.png
deleted file mode 100644
index 505ccd4..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_inandout_h.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_out_1x.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_out_1x.png
deleted file mode 100644
index 783c2b6..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_out_1x.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_out_3g.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_out_3g.png
deleted file mode 100644
index 001eaea..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_out_3g.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_out_e.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_out_e.png
deleted file mode 100644
index cbae7dc..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_out_e.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_out_g.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_out_g.png
deleted file mode 100644
index 11f3a5c..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_out_g.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_out_h.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_out_h.png
deleted file mode 100644
index eb42294..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_out_h.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_in_1x.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_in_1x.png
deleted file mode 100644
index 66fb60e..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_in_1x.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_in_3g.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_in_3g.png
deleted file mode 100644
index 07ea499..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_in_3g.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_in_e.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_in_e.png
deleted file mode 100644
index e39767a..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_in_e.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_in_g.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_in_g.png
deleted file mode 100644
index 47c1fca..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_in_g.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_in_h.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_in_h.png
deleted file mode 100755
index ac80dce..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_in_h.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_inandout_1x.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_inandout_1x.png
deleted file mode 100644
index f88091b..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_inandout_1x.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_inandout_3g.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_inandout_3g.png
deleted file mode 100644
index 95bb3cd..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_inandout_3g.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_inandout_e.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_inandout_e.png
deleted file mode 100644
index 0ef4701..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_inandout_e.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_inandout_g.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_inandout_g.png
deleted file mode 100644
index 31b926b..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_inandout_g.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_inandout_h.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_inandout_h.png
deleted file mode 100755
index ed02984..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_inandout_h.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_out_1x.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_out_1x.png
deleted file mode 100644
index 0ee5b08..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_out_1x.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_out_3g.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_out_3g.png
deleted file mode 100644
index cac7802..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_out_3g.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_out_e.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_out_e.png
deleted file mode 100644
index df6e195..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_out_e.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_out_g.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_out_g.png
deleted file mode 100644
index 4a2f867..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_out_g.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_out_h.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_out_h.png
deleted file mode 100755
index 2b4628f..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_data_out_h.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_gps_acquiring.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_gps_acquiring.png
deleted file mode 100644
index 150c9fc..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_gps_acquiring.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_no_sim.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_no_sim.png
deleted file mode 100644
index a0e59cf..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_no_sim.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_r_signal_0.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_r_signal_0.png
deleted file mode 100644
index 1ef75d3..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_r_signal_0.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_r_signal_0_fully.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_r_signal_0_fully.png
deleted file mode 100644
index 1ef75d3..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_r_signal_0_fully.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_r_signal_1.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_r_signal_1.png
deleted file mode 100644
index a7dc07e..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_r_signal_1.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_r_signal_1_fully.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_r_signal_1_fully.png
deleted file mode 100644
index f1f4c4e..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_r_signal_1_fully.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_r_signal_2.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_r_signal_2.png
deleted file mode 100644
index 918a476..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_r_signal_2.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_r_signal_2_fully.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_r_signal_2_fully.png
deleted file mode 100644
index 6e34e66..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_r_signal_2_fully.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_r_signal_3.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_r_signal_3.png
deleted file mode 100644
index 5b2acc6..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_r_signal_3.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_r_signal_3_fully.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_r_signal_3_fully.png
deleted file mode 100644
index 3664ab4..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_r_signal_3_fully.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_r_signal_4.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_r_signal_4.png
deleted file mode 100644
index f1ff548..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_r_signal_4.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_r_signal_4_fully.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_r_signal_4_fully.png
deleted file mode 100644
index b4fa481..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_r_signal_4_fully.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_ringer_silent.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_ringer_silent.png
deleted file mode 100644
index 5a741bb..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_ringer_silent.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_ringer_vibrate.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_ringer_vibrate.png
deleted file mode 100644
index 7ff375a..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_ringer_vibrate.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_roaming_cdma_0.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_roaming_cdma_0.png
deleted file mode 100644
index 4ecd65c..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_roaming_cdma_0.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_roaming_cdma_flash_anim0.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_roaming_cdma_flash_anim0.png
deleted file mode 100644
index 245677b..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_roaming_cdma_flash_anim0.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_roaming_cdma_flash_anim1.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_roaming_cdma_flash_anim1.png
deleted file mode 100644
index 4ecd65c..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_roaming_cdma_flash_anim1.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_0.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_0.png
deleted file mode 100644
index b16e436..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_0.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_0_fully.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_0_fully.png
deleted file mode 100644
index b16e436..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_0_fully.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_1.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_1.png
deleted file mode 100644
index 1b6ed74..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_1.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_1_fully.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_1_fully.png
deleted file mode 100644
index 43e35d3..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_1_fully.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_2.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_2.png
deleted file mode 100644
index 498adbb..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_2.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_2_fully.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_2_fully.png
deleted file mode 100644
index b7e42a0..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_2_fully.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_3.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_3.png
deleted file mode 100644
index 959fc5c..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_3.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_3_fully.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_3_fully.png
deleted file mode 100644
index f905979..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_3_fully.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_4.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_4.png
deleted file mode 100644
index 6e8e73c..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_4.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_4_fully.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_4_fully.png
deleted file mode 100644
index b5799c8..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_4_fully.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_flightmode.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_flightmode.png
deleted file mode 100644
index 6bc6201..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_flightmode.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_null.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_null.png
deleted file mode 100644
index 03d2147..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_null.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_tty_mode.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_tty_mode.png
deleted file mode 100644
index 4e161c6..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_tty_mode.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_0.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_0.png
deleted file mode 100644
index 98e874a..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_0.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_1.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_1.png
deleted file mode 100644
index 1626895..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_1.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_1_fully.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_1_fully.png
deleted file mode 100644
index 3c2e2b9..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_1_fully.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_2.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_2.png
deleted file mode 100644
index 77e6ee4..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_2.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_2_fully.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_2_fully.png
deleted file mode 100755
index 00d86bf..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_2_fully.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_3.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_3.png
deleted file mode 100644
index c2574e1..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_3.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_3_fully.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_3_fully.png
deleted file mode 100755
index 70c030b..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_3_fully.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_4.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_4.png
deleted file mode 100644
index 55caecf..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_4.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_4_fully.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_4_fully.png
deleted file mode 100755
index b5326d2..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_4_fully.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_wimax_signal_0.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_wimax_signal_0.png
deleted file mode 100644
index ba797ef..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_wimax_signal_0.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_wimax_signal_0_fully.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_wimax_signal_0_fully.png
deleted file mode 100644
index 5082fc0..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_wimax_signal_0_fully.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_wimax_signal_1.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_wimax_signal_1.png
deleted file mode 100644
index 897f6f1..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_wimax_signal_1.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_wimax_signal_1_fully.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_wimax_signal_1_fully.png
deleted file mode 100644
index 7501be7..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_wimax_signal_1_fully.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_wimax_signal_2.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_wimax_signal_2.png
deleted file mode 100644
index 06eed6f..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_wimax_signal_2.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_wimax_signal_2_fully.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_wimax_signal_2_fully.png
deleted file mode 100644
index 718af9c..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_wimax_signal_2_fully.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_wimax_signal_3.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_wimax_signal_3.png
deleted file mode 100644
index f4dc7c9..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_wimax_signal_3.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_wimax_signal_3_fully.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_wimax_signal_3_fully.png
deleted file mode 100644
index 271eda9..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_wimax_signal_3_fully.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_wimax_signal_4.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_wimax_signal_4.png
deleted file mode 100644
index 9f897d5..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_wimax_signal_4.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_wimax_signal_4_fully.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_wimax_signal_4_fully.png
deleted file mode 100644
index 57e9c93..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_sys_wimax_signal_4_fully.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_vibrate_off.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_vibrate_off.png
deleted file mode 100755
index 94c295b..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_vibrate_off.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_vibrate_on.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_vibrate_on.png
deleted file mode 100755
index 94c295b..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_vibrate_on.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_wifi_ap_off.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_wifi_ap_off.png
deleted file mode 100755
index 605c6a3..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_wifi_ap_off.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_wifi_ap_on.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_wifi_ap_on.png
deleted file mode 100755
index 8cacb0c..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_wifi_ap_on.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_wifi_off.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_wifi_off.png
deleted file mode 100755
index 7247846..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_wifi_off.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_wifi_on.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_wifi_on.png
deleted file mode 100755
index c4e7c84..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_wifi_on.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_wimax_off.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_wimax_off.png
deleted file mode 100755
index 909c96b..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_wimax_off.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_wimax_on.png b/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_wimax_on.png
deleted file mode 100755
index 4ff265f..0000000
--- a/overlay/tablet/frameworks/base/packages/SystemUI/res/drawable-mdpi/stat_wimax_on.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/packages/apps/ADWLauncher/res/values/config.xml b/overlay/tablet/packages/apps/ADWLauncher/res/values/config.xml
deleted file mode 100644
index 058dcdf..0000000
--- a/overlay/tablet/packages/apps/ADWLauncher/res/values/config.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <!-- config_desktopColumns/Rows min value is 3, so it will add 3 to whatever value you set here -->
-    <integer name="config_desktopColumns">3</integer>
-    <integer name="config_desktopRows">5</integer>
-</resources>
diff --git a/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/cyanogenmod_icon.png b/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/cyanogenmod_icon.png
deleted file mode 100755
index 436fe56..0000000
--- a/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/cyanogenmod_icon.png
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_boobies.jpg b/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_boobies.jpg
deleted file mode 100644
index 63f18f6..0000000
--- a/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_boobies.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_boobies_small.jpg b/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_boobies_small.jpg
deleted file mode 100644
index 64fa6f4..0000000
--- a/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_boobies_small.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_cm_nexus_08.jpg b/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_cm_nexus_08.jpg
deleted file mode 100644
index 9984fb4..0000000
--- a/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_cm_nexus_08.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_cm_nexus_08_small.jpg b/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_cm_nexus_08_small.jpg
deleted file mode 100644
index 2760d52..0000000
--- a/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_cm_nexus_08_small.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_fitsnugly_8bit.jpg b/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_fitsnugly_8bit.jpg
deleted file mode 100644
index 0fb3a89..0000000
--- a/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_fitsnugly_8bit.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_fitsnugly_8bit_small.jpg b/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_fitsnugly_8bit_small.jpg
deleted file mode 100644
index 124e341..0000000
--- a/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_fitsnugly_8bit_small.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_fitsnugly_cmearth.jpg b/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_fitsnugly_cmearth.jpg
deleted file mode 100644
index 2dda8c2..0000000
--- a/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_fitsnugly_cmearth.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_fitsnugly_cmearth_small.jpg b/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_fitsnugly_cmearth_small.jpg
deleted file mode 100644
index aa248b2..0000000
--- a/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_fitsnugly_cmearth_small.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_hazybluedots.jpg b/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_hazybluedots.jpg
deleted file mode 100644
index 9b23cf5..0000000
--- a/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_hazybluedots.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_hazybluedots_small.jpg b/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_hazybluedots_small.jpg
deleted file mode 100644
index c645dea..0000000
--- a/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_hazybluedots_small.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmbrickwall.jpg b/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmbrickwall.jpg
deleted file mode 100644
index 9916456..0000000
--- a/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmbrickwall.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmbrickwall_small.jpg b/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmbrickwall_small.jpg
deleted file mode 100644
index 59afc4c..0000000
--- a/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmbrickwall_small.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmceation.jpg b/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmceation.jpg
deleted file mode 100644
index 4cbaa24..0000000
--- a/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmceation.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmceation_small.jpg b/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmceation_small.jpg
deleted file mode 100644
index ca8f3a1..0000000
--- a/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmceation_small.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmchrome.jpg b/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmchrome.jpg
deleted file mode 100644
index 8681e28..0000000
--- a/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmchrome.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmchrome_small.jpg b/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmchrome_small.jpg
deleted file mode 100644
index 675a80b..0000000
--- a/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmchrome_small.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmdiamondplate.jpg b/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmdiamondplate.jpg
deleted file mode 100644
index dcf201f..0000000
--- a/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmdiamondplate.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmdiamondplate_small.jpg b/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmdiamondplate_small.jpg
deleted file mode 100644
index 6d04d88..0000000
--- a/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmdiamondplate_small.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmmodern.jpg b/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmmodern.jpg
deleted file mode 100644
index 67f0132..0000000
--- a/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmmodern.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmmodern_small.jpg b/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmmodern_small.jpg
deleted file mode 100644
index 6939b75..0000000
--- a/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmmodern_small.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmmoderntint.jpg b/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmmoderntint.jpg
deleted file mode 100644
index 76e6121..0000000
--- a/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmmoderntint.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmmoderntint_small.jpg b/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmmoderntint_small.jpg
deleted file mode 100644
index 445f488..0000000
--- a/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmmoderntint_small.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmorb.jpg b/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmorb.jpg
deleted file mode 100644
index cd20acd..0000000
--- a/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmorb.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmorb_small.jpg b/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmorb_small.jpg
deleted file mode 100644
index c845eee..0000000
--- a/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmorb_small.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmskateteam.jpg b/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmskateteam.jpg
deleted file mode 100644
index 299a448..0000000
--- a/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmskateteam.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmskateteam_small.jpg b/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmskateteam_small.jpg
deleted file mode 100644
index 182bca6..0000000
--- a/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmskateteam_small.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmwoodedbg.jpg b/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmwoodedbg.jpg
deleted file mode 100644
index a404d21..0000000
--- a/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmwoodedbg.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmwoodedbg_small.jpg b/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmwoodedbg_small.jpg
deleted file mode 100644
index 54d18bb..0000000
--- a/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmwoodedbg_small.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_arrowd_blue.jpg b/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_arrowd_blue.jpg
deleted file mode 100644
index 93a0954..0000000
--- a/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_arrowd_blue.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_arrowd_blue_small.jpg b/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_arrowd_blue_small.jpg
deleted file mode 100644
index 8be3458..0000000
--- a/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_arrowd_blue_small.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_arrowd_green.jpg b/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_arrowd_green.jpg
deleted file mode 100644
index 54befe0..0000000
--- a/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_arrowd_green.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_arrowd_green_small.jpg b/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_arrowd_green_small.jpg
deleted file mode 100644
index 3f6ef68..0000000
--- a/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_arrowd_green_small.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_arrowd_pink.jpg b/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_arrowd_pink.jpg
deleted file mode 100644
index 59795ea..0000000
--- a/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_arrowd_pink.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_arrowd_pink_small.jpg b/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_arrowd_pink_small.jpg
deleted file mode 100644
index 4eb9b34..0000000
--- a/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_arrowd_pink_small.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_lovecm.jpg b/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_lovecm.jpg
deleted file mode 100644
index 0cf39b3..0000000
--- a/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_lovecm.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_lovecm_small.jpg b/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_lovecm_small.jpg
deleted file mode 100644
index 094210e..0000000
--- a/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_lovecm_small.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_nexus_surf.jpg b/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_nexus_surf.jpg
deleted file mode 100644
index 5037e2c..0000000
--- a/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_nexus_surf.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_nexus_surf_small.jpg b/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_nexus_surf_small.jpg
deleted file mode 100644
index 90b0123..0000000
--- a/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_nexus_surf_small.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_revolutionary.jpg b/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_revolutionary.jpg
deleted file mode 100644
index 04c8ba6..0000000
--- a/overlay/tablet/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_prash_revolutionary.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/tablet/packages/apps/Settings/res/values-de/strings.xml b/overlay/tablet/packages/apps/Settings/res/values-de/strings.xml
deleted file mode 100644
index f7f40be..0000000
--- a/overlay/tablet/packages/apps/Settings/res/values-de/strings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="about_settings">Über das Tablet</string>
-</resources>
diff --git a/overlay/tablet/packages/apps/Settings/res/values-it/strings.xml b/overlay/tablet/packages/apps/Settings/res/values-it/strings.xml
deleted file mode 100644
index 7e4afc4..0000000
--- a/overlay/tablet/packages/apps/Settings/res/values-it/strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
-    <!-- Main settings screen, setting title for the user to go into the About phone screen -->
-    <string name="about_settings">Info sul tablet</string>
-
-</resources>
-
diff --git a/overlay/tablet/packages/apps/Settings/res/values-pt/strings.xml b/overlay/tablet/packages/apps/Settings/res/values-pt/strings.xml
deleted file mode 100644
index d2a22f4..0000000
--- a/overlay/tablet/packages/apps/Settings/res/values-pt/strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
-    <!-- Main settings screen, setting title for the user to go into the About phone screen -->
-    <string name="about_settings">Sobre tablet</string>
-
-</resources>
-
diff --git a/overlay/tablet/packages/apps/Settings/res/values-ru/strings.xml b/overlay/tablet/packages/apps/Settings/res/values-ru/strings.xml
deleted file mode 100644
index c5ded5d..0000000
--- a/overlay/tablet/packages/apps/Settings/res/values-ru/strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
-    <!-- Main settings screen, setting title for the user to go into the About phone screen -->
-    <string name="about_settings">О планшетном ПК</string>
-
-</resources>
-
diff --git a/overlay/tablet/packages/apps/Settings/res/values-zh-rTW/strings.xml b/overlay/tablet/packages/apps/Settings/res/values-zh-rTW/strings.xml
deleted file mode 100644
index 50770a6..0000000
--- a/overlay/tablet/packages/apps/Settings/res/values-zh-rTW/strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
-    <!-- Main settings screen, setting title for the user to go into the About phone screen -->
-    <string name="about_settings">關於平板</string>
-
-</resources>
-
diff --git a/overlay/tablet/packages/apps/Settings/res/values/strings.xml b/overlay/tablet/packages/apps/Settings/res/values/strings.xml
deleted file mode 100644
index 8d953fa..0000000
--- a/overlay/tablet/packages/apps/Settings/res/values/strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
-    <!-- Main settings screen, setting title for the user to go into the About phone screen -->
-    <string name="about_settings">About tablet</string>
-
-</resources>
-
diff --git a/overlay/tablet/packages/inputmethods/LatinIME/java/res/values-land/dimens.xml b/overlay/tablet/packages/inputmethods/LatinIME/java/res/values-land/dimens.xml
deleted file mode 100644
index f7f30eb..0000000
--- a/overlay/tablet/packages/inputmethods/LatinIME/java/res/values-land/dimens.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* 
-**
-** Copyright 2008, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-
-<resources>
-    <!-- key_height + key_bottom_gap = popup_key_height -->
-    <dimen name="key_height">60dip</dimen>
-    <dimen name="key_bottom_gap">4dip</dimen>
-    <dimen name="popup_key_height">43dip</dimen>
-    <!-- Amount of allowance for selecting keys in a mini popup keyboard by sliding finger. -->
-    <!-- popup_key_height x 1.7 -->
-    <dimen name="mini_keyboard_slide_allowance">74dip</dimen>
-    <!-- popup_key_height x 1.0 -->
-    <dimen name="mini_keyboard_vertical_correction">-43dip</dimen>
-</resources>
diff --git a/overlay/tablet/packages/inputmethods/LatinIME/java/res/values/dimens.xml b/overlay/tablet/packages/inputmethods/LatinIME/java/res/values/dimens.xml
deleted file mode 100644
index c800787..0000000
--- a/overlay/tablet/packages/inputmethods/LatinIME/java/res/values/dimens.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* 
-**
-** Copyright 2008, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-
-<resources>
-    <!-- key_height + key_bottom_gap = popup_key_height -->
-    <dimen name="key_height">60dip</dimen>
-    <dimen name="key_bottom_gap">6dip</dimen>
-    <dimen name="popup_key_height">60dip</dimen>
-    <dimen name="keyboard_bottom_padding">10dip</dimen>
-    <!-- If the screen height in landscape is larger than the below value, then the keyboard
-         will not go into extract (fullscreen) mode. -->
-    <dimen name="max_height_for_fullscreen">400dip</dimen>
-    <dimen name="key_text_size">21dip</dimen>
-    <dimen name="key_label_text_size">13dip</dimen>
-    <!-- Amount of allowance for selecting keys in a mini popup keyboard by sliding finger. -->
-    <!-- popup_key_height x 1.7 -->
-    <dimen name="mini_keyboard_slide_allowance">88.5dip</dimen>
-    <!-- popup_key_height x 1.0 -->
-    <dimen name="mini_keyboard_vertical_correction">-52dip</dimen>
-    <dimen name="key_hysteresis_distance">80dip</dimen>
-    <!-- We use "inch", not "dip" because this value tries dealing with physical distance related
-         to user's finger. -->
-    <dimen name="keyboard_vertical_correction">-8dip</dimen>
-    <dimen name="candidate_min_touchable_width">48dip</dimen>
-</resources>
diff --git a/overlay/vega/packages/apps/ADWLauncher/res/values/config.xml b/overlay/vega/packages/apps/ADWLauncher/res/values/config.xml
deleted file mode 100644
index d2606e9..0000000
--- a/overlay/vega/packages/apps/ADWLauncher/res/values/config.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- config_desktopColumns/Rows min value is 3, so it will add 3 to whatever value you set here -->
-    <integer name="config_desktopColumns">5</integer>
-    <integer name="config_desktopRows">4</integer>
-</resources>
diff --git a/overlay/vega/packages/apps/CMParts/res/values/config.xml b/overlay/vega/packages/apps/CMParts/res/values/config.xml
deleted file mode 100644
index 4cab749..0000000
--- a/overlay/vega/packages/apps/CMParts/res/values/config.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- Whether or not to display the trackball settings -->
-    <bool name="has_trackball">false</bool>
-
-    <bool name="has_led_flash">false</bool>
-</resources>
diff --git a/overlay/vibrantmtd/frameworks/base/core/res/res/values/config.xml b/overlay/vibrantmtd/frameworks/base/core/res/res/values/config.xml
deleted file mode 100644
index 8b667e7..0000000
--- a/overlay/vibrantmtd/frameworks/base/core/res/res/values/config.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2009, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-<resources>
-
-    <!-- Component name of the default wallpaper. This will be ImageWallpaper if not 
-         specified -->
-    <string name="default_wallpaper_component">com.android.wallpaper/.nexus.NexusWallpaper</string>
-
-</resources>
diff --git a/overlay/vibrantmtd/packages/apps/CMParts/res/values/config.xml b/overlay/vibrantmtd/packages/apps/CMParts/res/values/config.xml
deleted file mode 100644
index 443462f..0000000
--- a/overlay/vibrantmtd/packages/apps/CMParts/res/values/config.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- Whether or not to display the trackball settings -->
-    <bool name="has_trackball">false</bool>
-    <bool name="has_rgb_notification_led">false</bool>
-    <bool name="has_camera_button">false</bool>
-    <bool name="has_led_flash">false</bool>
-</resources>
diff --git a/overlay/vision/frameworks/base/core/res/res/values/config.xml b/overlay/vision/frameworks/base/core/res/res/values/config.xml
deleted file mode 100644
index 960a389..0000000
--- a/overlay/vision/frameworks/base/core/res/res/values/config.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2011, The CyanogenMod Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<resources>
-
-    <!-- Component name of the default wallpaper. This will be ImageWallpaper if not
-         specified -->
-    <string name="default_wallpaper_component">com.android.wallpaper/.nexus.NexusWallpaper</string>
-
-</resources>
diff --git a/overlay/vision/packages/apps/CMParts/res/values/config.xml b/overlay/vision/packages/apps/CMParts/res/values/config.xml
deleted file mode 100644
index 8711581..0000000
--- a/overlay/vision/packages/apps/CMParts/res/values/config.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- Whether or not to display the trackball settings -->
-    <bool name="has_trackball">true</bool>
-    <bool name="has_rgb_notification_led">false</bool>
-    <bool name="has_camera_button">true</bool>
-    <bool name="has_led_flash">true</bool>
-</resources>
diff --git a/overlay/vision/packages/apps/Camera/res/values/config.xml b/overlay/vision/packages/apps/Camera/res/values/config.xml
deleted file mode 100644
index 2cba641..0000000
--- a/overlay/vision/packages/apps/Camera/res/values/config.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2011, The CyanogenMod Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- These resources are around just to allow their values to be customized
-     for different hardware and product builds. -->
-<resources>
-        <string name="filtered_pictureSizes">2592x1936</string>
-</resources>
-
diff --git a/overlay/vivo/frameworks/base/core/res/res/values/config.xml b/overlay/vivo/frameworks/base/core/res/res/values/config.xml
deleted file mode 100644
index 960a389..0000000
--- a/overlay/vivo/frameworks/base/core/res/res/values/config.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2011, The CyanogenMod Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<resources>
-
-    <!-- Component name of the default wallpaper. This will be ImageWallpaper if not
-         specified -->
-    <string name="default_wallpaper_component">com.android.wallpaper/.nexus.NexusWallpaper</string>
-
-</resources>
diff --git a/overlay/vivo/packages/apps/CMParts/res/values/config.xml b/overlay/vivo/packages/apps/CMParts/res/values/config.xml
deleted file mode 100644
index 1f71848..0000000
--- a/overlay/vivo/packages/apps/CMParts/res/values/config.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- Whether or not to display the trackball settings -->
-    <bool name="has_trackball">false</bool>
-    <bool name="has_rgb_notification_led">false</bool>
-
-    <bool name="has_led_flash">true</bool>
-</resources>
diff --git a/overlay/vivow/frameworks/base/core/res/res/values/config.xml b/overlay/vivow/frameworks/base/core/res/res/values/config.xml
deleted file mode 100644
index 960a389..0000000
--- a/overlay/vivow/frameworks/base/core/res/res/values/config.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2011, The CyanogenMod Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<resources>
-
-    <!-- Component name of the default wallpaper. This will be ImageWallpaper if not
-         specified -->
-    <string name="default_wallpaper_component">com.android.wallpaper/.nexus.NexusWallpaper</string>
-
-</resources>
diff --git a/overlay/vivow/packages/apps/CMParts/res/values/config.xml b/overlay/vivow/packages/apps/CMParts/res/values/config.xml
deleted file mode 100644
index 1f71848..0000000
--- a/overlay/vivow/packages/apps/CMParts/res/values/config.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- Whether or not to display the trackball settings -->
-    <bool name="has_trackball">false</bool>
-    <bool name="has_rgb_notification_led">false</bool>
-
-    <bool name="has_led_flash">true</bool>
-</resources>
diff --git a/overlay/zeppelin/packages/apps/CMParts/res/values/config.xml b/overlay/zeppelin/packages/apps/CMParts/res/values/config.xml
deleted file mode 100644
index 913a3db..0000000
--- a/overlay/zeppelin/packages/apps/CMParts/res/values/config.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- Whether or not to display the trackball settings -->
-    <bool name="has_trackball">false</bool>
-    <bool name="has_camera_button">true</bool>
-    <bool name="has_rgb_notification_led">false</bool>
-    <bool name="has_led_flash">true</bool>
-</resources>
diff --git a/prebuilt/common/bin/backuptool.sh b/prebuilt/common/bin/backuptool.sh
index 85f800e..95129ef 100755
--- a/prebuilt/common/bin/backuptool.sh
+++ b/prebuilt/common/bin/backuptool.sh
@@ -5,7 +5,7 @@
 
 C=/tmp/backupdir
 S=/system
-V=CyanogenMod-7
+V=CyanogenMod-9
 
 PROCEED=1;
 
@@ -35,50 +35,64 @@
 
 get_files() {
     cat <<EOF
-app/BooksPhone.apk
-app/CarHomeGoogle.apk
-app/CarHomeLauncher.apk
-app/Facebook.apk
-app/FOTAKill.apk
-app/GenieWidget.apk
-app/Gmail.apk
-app/GoogleBackupTransport.apk
-app/GoogleCalendarSyncAdapter.apk
-app/GoogleContactsSyncAdapter.apk
-app/GoogleFeedback.apk
-app/GooglePartnerSetup.apk
-app/GoogleQuickSearchBox.apk app/QuickSearchBox.apk
-app/GoogleServicesFramework.apk
-app/googlevoice.apk
-app/HtcCopyright.apk
-app/HtcEmailPolicy.apk
-app/HtcSettings.apk
-app/kickback.apk
-app/LatinImeTutorial.apk
-app/Maps.apk
-app/MapsSapphire.apk
-app/MarketUpdater.apk
-app/MediaUploader.apk
-app/NetworkLocation.apk
-app/OneTimeInitializer.apk
-app/PassionQuickOffice.apk
-app/Quickoffice.apk
-app/SetupWizard.apk app/Provision.apk
-app/soundback.apk
-app/Street.apk
-app/Talk.apk
-app/Talk2.apk
-app/talkback.apk
-app/Twitter.apk
-app/Vending.apk
-app/VoiceSearch.apk
-app/YouTube.apk
-etc/permissions/com.google.android.maps.xml
-etc/permissions/features.xml
+vendor/pittpatt/models/recognition/face.face.y0-y0-22-b-N/full_model.bin
+vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.3/left_eye-y0-yi45-p0-pi45-rn7-ri20.2d_n2/full_model.bin
+vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.3/nose_base-y0-yi45-p0-pi45-r0-ri20.2d_n2/full_model.bin
+vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.3/right_eye-y0-yi45-p0-pi45-rp7-ri20.2d_n2/full_model.bin
+vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.3/nose_base-y0-yi45-p0-pi45-rp7-ri20.2d_n2/full_model.bin
+vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.3/left_eye-y0-yi45-p0-pi45-rp7-ri20.2d_n2/full_model.bin
+vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.3/right_eye-y0-yi45-p0-pi45-rn7-ri20.2d_n2/full_model.bin
+vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.3/nose_base-y0-yi45-p0-pi45-rn7-ri20.2d_n2/full_model.bin
+vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.3/right_eye-y0-yi45-p0-pi45-r0-ri20.2d_n2/full_model.bin
+vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.3/left_eye-y0-yi45-p0-pi45-r0-ri20.2d_n2/full_model.bin
+vendor/pittpatt/models/detection/yaw_roll_face_detectors.3/head-y0-yi45-p0-pi45-rn30-ri30.5/full_model.bin
+vendor/pittpatt/models/detection/yaw_roll_face_detectors.3/head-y0-yi45-p0-pi45-rp30-ri30.5/full_model.bin
+vendor/pittpatt/models/detection/yaw_roll_face_detectors.3/head-y0-yi45-p0-pi45-r0-ri30.4a/full_model.bin
+framework/com.google.widevine.software.drm.jar
 framework/com.google.android.maps.jar
-lib/libspeech.so
-lib/libtalk_jni.so
+framework/com.google.android.media.effects.jar
+lib/libfilterpack_facedetect.so
+lib/libfacelock_jni.so
 lib/libvoicesearch.so
+etc/permissions/com.google.android.nfc_extras.xml
+etc/permissions/com.google.android.media.effects.xml
+etc/permissions/com.google.android.maps.xml
+etc/permissions/com.google.widevine.software.drm.xml
+etc/permissions/features.xml
+app/LatinImeGoogle.apk app/LatinIme.apk
+app/MediaUploader.apk
+app/GoogleFeedback.apk
+app/GoogleTTS.apk
+app/CalendarGoogle.apk app/Calendar.apk
+app/MarketUpdater.apk
+app/BrowserGoogle.apk app/Browser.apk
+app/GoogleServicesFramework.apk
+app/CameraGoogle.apk app/Camera.apk
+app/YouTube.apk
+app/GenieWidget.apk
+app/GooglePackageVerifierUpdater.apk
+app/SetupWizard.apk app/Provision.apk
+app/GoogleEarth.apk
+app/ChromeBookmarksSyncAdapter.apk
+app/ExchangeGoogle.apk app/Exchange.apk
+app/GoogleQuickSearchBox.apk
+app/GoogleLoginService.apk
+app/Talk.apk
+app/DeskClockGoogle.apk app/DeskClock.apk
+app/GooglePackageVerifier.apk
+app/NfcGoogle.apk app/Nfc.apk
+app/GoogleBackupTransport.apk
+app/GalleryGoogle.apk app/Gallery.apk
+app/VideoEditorGoogle.apk app/VideoEditor.apk
+app/FaceLock.apk
+app/Vending.apk
+app/EmailGoogle.apk app/Email.apk
+app/GoogleContactsSyncAdapter.apk
+app/Gmail.apk
+app/OneTimeInitializer.apk
+app/NetworkLocation.apk
+app/TagGoogle.apk
+app/GooglePartnerSetup.apk
 etc/hosts
 etc/custom_backup_list.txt
 etc/force_backuptool
diff --git a/prebuilt/common/bin/compcache b/prebuilt/common/bin/compcache
old mode 100755
new mode 100644
diff --git a/prebuilt/common/bin/fix_permissions b/prebuilt/common/bin/fix_permissions
old mode 100755
new mode 100644
diff --git a/prebuilt/common/bin/handle_compcache b/prebuilt/common/bin/handle_compcache
old mode 100755
new mode 100644
diff --git a/prebuilt/common/bin/sysinit b/prebuilt/common/bin/sysinit
old mode 100755
new mode 100644
diff --git a/prebuilt/common/bin/verify_cache_partition_size.sh b/prebuilt/common/bin/verify_cache_partition_size.sh
deleted file mode 100644
index 07dd34e..0000000
--- a/prebuilt/common/bin/verify_cache_partition_size.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/sbin/sh
-#
-# Force /system dalvik-cache on /data instead of /cache if is not large enough
-#
-
-CACHESIZE=$(df -k /cache | tail -n1 | tr -s ' ' | cut -d ' ' -f2)
-if [ $CACHESIZE -lt 60000 ]
-then
-  echo "dalvik.vm.dexopt-data-only=1" >> /system/build.prop
-fi
-
-exit 0
diff --git a/prebuilt/common/bootanimation.zip b/prebuilt/common/bootanimation.zip
new file mode 100644
index 0000000..528e840
--- /dev/null
+++ b/prebuilt/common/bootanimation.zip
Binary files differ
diff --git a/prebuilt/common/etc/apns-conf.xml b/prebuilt/common/etc/apns-conf.xml
index e6cce49..68d233a 100644
--- a/prebuilt/common/etc/apns-conf.xml
+++ b/prebuilt/common/etc/apns-conf.xml
@@ -7,7 +7,7 @@
 ** you may not use this file except in compliance with the License.
 ** You may obtain a copy of the License at
 **
-** http://www.apache.org/licenses/LICENSE-2.0
+**     http://www.apache.org/licenses/LICENSE-2.0
 **
 ** Unless required by applicable law or agreed to in writing, software
 ** distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,8 +16,10 @@
 ** limitations under the License.
 */
 -->
+
 <!-- use empty string to specify no proxy or port -->
-<apns version="6">
+<!-- This version must agree with that in apps/common/res/apns.xml -->
+<apns version="7">
   <apn carrier="Cosmote GR" mcc="202" mnc="01" apn="Internet" type="default,supl" />
   <apn carrier="Cosmote GR MMS" mcc="202" mnc="01" apn="Mms" mmsc="195.167.65.220:8002" mmsproxy="10.10.10.20" mmsport="8080" type="mms" />
   <apn carrier="Cosmote Wireless Internet" mcc="202" mnc="01" apn="internet" type="default,supl" />
@@ -113,7 +115,7 @@
   <apn carrier="ERONET 1GB" mcc="218" mnc="03" apn="data4.eronet.ba" user="" server="" password="" proxy="" port="" mmsc="" type="supl"/>
   <apn carrier="ERONET 4GB" mcc="218" mnc="03" apn="data2.eronet.ba" user="" server="" password="" proxy="" port="" mmsc="" type="supl"/>
   <apn carrier="ERONET FLAT" mcc="218" mnc="03" apn="data3.eronet.ba" user="" server="" password="" proxy="" port="" mmsc="" type="supl"/>
-  <apn carrier="ERONET MMS" mcc="218" mnc="03" apn="mms.eronet.ba" user="" server="" password="" mmsc="http://mms.gprs.eronet.ba/mms/wapenc" mmsproxy="010.012.003.001" mmsport="8080" type="mms"/> 
+  <apn carrier="ERONET MMS" mcc="218" mnc="03" apn="mms.eronet.ba" user="" server="" password="" mmsc="http://mms.gprs.eronet.ba/mms/wapenc" mmsproxy="010.012.003.001" mmsport="8080" type="mms"/>
   <apn carrier="BH Mobile" mcc="218" mnc="90" apn="active.bhmobile.ba" type="default,supl" />
   <apn carrier="BH Mobile MMS" mcc="218" mnc="90" apn="mms.bhmobile.ba" mmsc="http://mms.bhmobile.ba/cmmsc/post" mmsproxy="195.222.056.041" mmsport="8080" type="mms" />
   <apn carrier="T-Mobile HR MMS" mcc="219" mnc="01" apn="mms.htgprs" mmsc="http://mms.t-mobile.hr/servlets/mms" mmsproxy="10.12.0.4" mmsport="8080" type="mms" />
@@ -251,9 +253,9 @@
   <apn carrier="Telia DK MMS" mcc="238" mnc="20" apn="www.mms.mtelia.dk" mmsc="http://mms.telia.dk" mmsproxy="193.209.134.131" mmsport="8080" type="mms" />
   <apn carrier="Telenor Internet" mcc="238" mnc="77" apn="Internet" type="default,supl" />
   <apn carrier="Telenor MMS" mcc="238" mnc="77" apn="telenor" mmsc="http://mms.telenor.dk" mmsproxy="212.88.64.8" mmsport="8080" type="mms" />
-  <apn carrier="Halebop Internet" mcc="240" mnc="01" apn="halebop.telia.se" type="default,supl" /> 
+  <apn carrier="Halebop Internet" mcc="240" mnc="01" apn="halebop.telia.se" type="default,supl" />
   <apn carrier="Halebop MMS" mcc="240" mnc="01" apn="mms.telia.se" user="mms" password="telia" mmsc="http://mmss/" mmsproxy="193.209.134.132" mmsport="8080" type="mms" />
-  <apn carrier="Telia SE MMS" mcc="240" mnc="01" apn="mms.telia.se" user="mms" server="" password="telia" mmsc="http://mmss/" mmsproxy="193.209.134.132" mmsport="80" type="mms"/> 
+  <apn carrier="Telia SE MMS" mcc="240" mnc="01" apn="mms.telia.se" user="mms" server="" password="telia" mmsc="http://mmss/" mmsproxy="193.209.134.132" mmsport="80" type="mms"/>
   <apn carrier="Telia SE" mcc="240" mnc="01" apn="online.telia.se" user="*" type="default,supl" />
   <apn carrier="3 SE" mcc="240" mnc="02" apn="data.tre.se" type="default,supl,mms" />
   <apn carrier="3 SE MMS" mcc="240" mnc="02" apn="data.tre.se" mmsc="http://mms.tre.se" mmsproxy="mmsproxy.tre.se" mmsport="8799" type="mms" />
@@ -352,7 +354,7 @@
   <apn carrier="Internet" mcc="250" mnc="17" apn="internet.usi.ru" type="default,supl" />
   <apn carrier="MMS" mcc="250" mnc="17" apn="mms.usi.ru" mmsc="http://mms" mmsproxy="192.168.168.192" mmsport="8080" type="mms" />
   <apn carrier="Tele2 RU" mcc="250" mnc="20" apn="internet.tele2.ru" type="default,supl" />
-  <apn carrier="Tele2 RU MMS" mcc="250" mnc="20" apn="mms.tele2.ru" mmsc="http://mmsc.tele2.ru" mmsproxy="193.12.40.65" mmsport="8080" type="mms" />  
+  <apn carrier="Tele2 RU MMS" mcc="250" mnc="20" apn="mms.tele2.ru" mmsc="http://mmsc.tele2.ru" mmsproxy="193.12.40.65" mmsport="8080" type="mms" />
   <apn carrier="МТС-интернет" mcc="250" mnc="39" apn="internet.mts.ru" user="mts" password="mts" type="default,supl" />
   <apn carrier="МТС Центр MMS" mcc="250" mnc="39" apn="mms.mts.ru" user="mts" password="mts" mmsc="http://mmsc" mmsproxy="192.168.192.192" mmsport="8080" type="mms" />
   <apn carrier="Beeline internet" mcc="250" mnc="44" apn="internet.beeline.ru" user="beeline" password="beeline" type="default,supl" />
@@ -403,7 +405,7 @@
   <apn carrier="PlusGSM MMS" mcc="260" mnc="01" apn="mms" mmsc="http://mms.plusgsm.pl:8002" mmsproxy="212.002.096.016" mmsport="8080" type="mms" />
   <apn carrier="FM Group Mobile" mcc="260" mnc="01" apn="www.fmgmobie.pl" type="default,supl" />
   <apn carrier="mBank mobile" mcc="260" mnc="01" apn="www.mobile.pl" type="default,supl" />
-  <apn carrier="mBank mobile MMS" apn="mms.mobile.pl" mcc="260" mnc="01" user="" password="" mmsproxy="212.2.96.16" mmsport="8080" mmsc="http://mms.mobile.pl:8002" type="mms"/> 
+  <apn carrier="mBank mobile MMS" apn="mms.mobile.pl" mcc="260" mnc="01" user="" password="" mmsproxy="212.2.96.16" mmsport="8080" mmsc="http://mms.mobile.pl:8002" type="mms"/>
   <apn carrier="Carrefour Mova" mcc="260" mnc="01" apn="www.mova.pl" type="default,supl" />
   <apn carrier="Era Internet" mcc="260" mnc="02" apn="erainternet" user="erainternet" password="erainternet" server="*" type="default,supl" />
   <apn carrier="Tak-Tak" mcc="260" mnc="02" apn="erainternettt" user="erainternet" password="erainternet" type="default,supl" />
@@ -557,7 +559,7 @@
   <apn carrier="AWS MMS" mcc="310" mnc="380" apn="proxy" mmsc="http://mmsc.mymmode.com" mmsproxy="10.250.250.55" mmsport="8080" type="mms" />
   <apn carrier="Celloneet MMS" mcc="310" mnc="390" apn="mms.celloneet.com" user="user1@mms.celloneet.com" password="celloneet" mmsc="http://mms.celloneet.com/servlets/mms" mmsproxy="63.99.231.135" mmsport="8080" type="mms" />
   <apn carrier="ATT" mcc="310" mnc="410" apn="wap.cingular" user="WAP@CINGULARGPRS.COM" mmsc="http://mmsc.cingular.com" mmsproxy="wireless.cingular.com" mmsport="80" type="default,supl,mms" />
-  <apn carrier="CBW Internet" apn="wap.gocbw.com" proxy="" port="" user="cbw" password="" server="" mmsc="http://mms.gocbw.com:8088/mms" mmsproxy="216.68.79.202" mmsport="80" mcc="310" mnc="420" type="default,supl,mms" /> 
+  <apn carrier="CBW Internet" apn="wap.gocbw.com" proxy="" port="" user="cbw" password="" server="" mmsc="http://mms.gocbw.com:8088/mms" mmsproxy="216.68.79.202" mmsport="80" mcc="310" mnc="420" type="default,supl,mms" />
   <apn carrier="DataConnect" mcc="310" mnc="470" apn="isp.cingular" type="default,supl" />
   <apn carrier="MediaNet" mcc="310" mnc="470" apn="wap.cingular" user="WAP@CINGULARGPRS.COM" password="CINGULAR1" mmsc="http://mmsc.cingular.com" mmsproxy="66.209.11.32" mmsport="8080" type="default,supl,mms" />
   <apn carrier="DataConnect" mcc="310" mnc="480" apn="isp.cingular" type="default,supl" />
@@ -1123,7 +1125,7 @@
   <apn carrier="Optus Internet" mcc="505" mnc="02" apn="yesinternet" user="*" password="*" server="*" type="default,supl" />
   <apn carrier="Vodafone AU-MMS" mcc="505" mnc="03" apn="live.vodafone.com" user="*" password="*" server="*" mmsc="http://pxt.vodafone.net.au/pxtsend" mmsproxy="10.202.2.60" mmsport="8080" type="mms" />
   <apn carrier="Vodafone AU" mcc="505" mnc="03" apn="vfinternet.au" user="*" password="*" server="*" type="default,supl" />
-  <apn carrier="3 AU" apn="3services" mmsc="http://mmsc.three.net.au:10021/mmsc" mmsproxy="10.176.57.25" mmsport="8799" mcc="505" mnc="06" type="default,supl,mms"/> 
+  <apn carrier="3 AU" apn="3services" mmsc="http://mmsc.three.net.au:10021/mmsc" mmsproxy="10.176.57.25" mmsport="8799" mcc="505" mnc="06" type="default,supl,mms"/>
   <apn carrier="VF AU PXT" mcc="505" mnc="07" apn="live.vodafone.com" mmsc="http://pxt.vodafone.net.au/pxtsend" mmsproxy="10.202.2.60" mmsport="8080" type="mms" />
   <apn carrier="VF Internet" mcc="505" mnc="07" apn="vfinternet.au" type="default,supl" />
   <apn carrier="Telstra MMS" mcc="505" mnc="11" apn="Telstra.mms" mmsc="http://mmsc.telstra.com:8002" mmsproxy="10.1.1.180" mmsport="80" type="mms" />
@@ -1213,7 +1215,7 @@
   <apn carrier="Meditel" mcc="604" mnc="00" apn="internet1.meditel.ma" user="MEDIWAP" password="MEDIWAP" type="default,supl" />
   <apn carrier="Meditel MMS" mcc="604" mnc="00" apn="mms.meditel.ma" user="MEDIMMS" password="MEDIMMS" mmsc="http://mms.meditel.ma:8088/mms" mmsproxy="010.008.008.009" type="mms" />
   <apn carrier="IAM" mcc="604" mnc="01" apn="www.iamgprs1.ma" type="default,supl" />
-  <apn carrier="IAM MMS" apn="mmsiam" mmsc="http://mms:8002" mmsproxy="10.16.35.50" mmsport="8080" mcc="604" mnc="01" type="default,supl,mms"/>  
+  <apn carrier="IAM MMS" apn="mmsiam" mmsc="http://mms:8002" mmsproxy="10.16.35.50" mmsport="8080" mcc="604" mnc="01" type="default,supl,mms"/>
   <apn carrier="Orange TN" mcc="605" mnc="01" apn="keypro" type="default,supl" />
   <apn carrier="Libyana MMS" mcc="606" mnc="00" apn="mms" mmsc="http://62.240.62.180:80" mmsproxy="192.168.8.148" mmsport="8000" type="mms" />
   <apn carrier="Libyana" mcc="606" mnc="00" apn="wap" proxy="192.168.8.148" port="8000" type="default,supl" />
diff --git a/prebuilt/common/etc/init.d/00banner b/prebuilt/common/etc/init.d/00banner
old mode 100755
new mode 100644
diff --git a/prebuilt/common/etc/init.d/01sysctl b/prebuilt/common/etc/init.d/01sysctl
deleted file mode 100755
index bba6a83..0000000
--- a/prebuilt/common/etc/init.d/01sysctl
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/system/bin/sh
-sysctl -p
diff --git a/prebuilt/common/etc/init.d/03firstboot b/prebuilt/common/etc/init.d/03firstboot
deleted file mode 100755
index bd084a0..0000000
--- a/prebuilt/common/etc/init.d/03firstboot
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/system/bin/sh
-# execute any postinstall script then kill it
-if [ -e /data/firstboot.sh ];
-then
-   log -p i -t boot "Executing firstboot.sh..";
-   logwrapper /system/bin/sh /data/firstboot.sh;
-   rm -f /data/firstboot.sh;
-fi;
-
diff --git a/prebuilt/common/etc/init.d/04modules b/prebuilt/common/etc/init.d/04modules
deleted file mode 100755
index 1f00d63..0000000
--- a/prebuilt/common/etc/init.d/04modules
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/system/bin/sh
-#
-# Load any extra modules
-
-MODULES="ipv6"
-
-KVER=`uname -r`
-if [ ! -d /system/lib/modules/$KVER ]
-then
-    exit 0
-fi
-
-for i in $MODULES
-do
-    modprobe $i >/dev/null 2>&1
-done
-
-exit 0
diff --git a/prebuilt/common/etc/init.d/05mountsd b/prebuilt/common/etc/init.d/05mountsd
deleted file mode 100755
index b34b171..0000000
--- a/prebuilt/common/etc/init.d/05mountsd
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/system/bin/sh
-#
-# mount ext partition from sd card
-
-BB="logwrapper busybox";
-
-if [ "$SD_EXT_DIRECTORY" = "" ];
-then
-    SD_EXT_DIRECTORY=/sd-ext;
-fi;
-
-# find SD Card
-for MMC_NUM in `seq 0 9`;
-do
-    MMC_TYPE=`cat /sys/block/mmcblk$MMC_NUM/device/type`
-    if [ "$MMC_TYPE" = "SD" ];
-    then
-        # 2nd partition of sdcard should be the sd-ext if exist
-        SD_EXT_PART=/dev/block/mmcblk${MMC_NUM}p2
-        break
-    fi
-done
-
-if [ -b "$SD_EXT_PART" ];
-then
-    log -p i -t mountsd "Checking filesystems..";
-
-    # fsck the sdcard filesystem first
-    if [ -x `which e2fsck` ];
-    then
-        e2fsck -y $SD_EXT_PART
-        e2fsk_exitcode=$?
-    else
-        echo "executable e2fsck not found, assuming no filesystem errors"
-        e2fsk_exitcode=0
-    fi
-
-    # set property with exit code in case an error occurs
-    setprop cm.e2fsck.errors $e2fsk_exitcode;
-    if [ "$e2fsk_exitcode" -lt 2 ];
-    then
-        # mount and set perms
-        $BB mount -o noatime,nodiratime,barrier=1 -t ext3 $SD_EXT_PART $SD_EXT_DIRECTORY;
-        if [ "$?" = 0 ];
-        then
-            $BB chown 1000:1000 $SD_EXT_DIRECTORY;
-            $BB chmod 771 $SD_EXT_DIRECTORY;
-            log -p i -t mountsd "$SD_EXT_DIRECTORY successfully mounted";
-        else
-            log -p e -t mountsd "Unable to mount filesystem for $SD_EXT_DIRECTORY!";
-        fi
-    else
-        log -p e -t mountsd "Unable to repair filesystem, disabling apps2sd";
-    fi
-fi
diff --git a/prebuilt/common/etc/init.d/06mountdl b/prebuilt/common/etc/init.d/06mountdl
deleted file mode 100755
index 14bc167..0000000
--- a/prebuilt/common/etc/init.d/06mountdl
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/system/bin/sh
-#
-# bind mount /data/local/download to /cache/download if cache
-# partition is too small
-#
-
-CACHESIZE=$(df -k /cache | tail -n1 | tr -s ' ' | cut -d ' ' -f2)
-DATAONLY=$(getprop dalvik.vm.dexopt-data-only)
-if [ $DATAONLY -eq 1 ]
-then
-  NEEDED=60000
-else
-  NEEDED=105000
-fi
-
-if [ $CACHESIZE -lt $NEEDED ]
-then
-  mount -o bind /data/local/download /cache/download
-fi
-
-rm /cache/download/downloadfile*.apk >/dev/null 2>&1
-
-exit 0
diff --git a/prebuilt/common/etc/init.d/10apps2sd b/prebuilt/common/etc/init.d/10apps2sd
deleted file mode 100755
index b4d0192..0000000
--- a/prebuilt/common/etc/init.d/10apps2sd
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/system/bin/sh
-# Make sure the Apps2SD structure exists.
-
-if [ "$SD_EXT_DIRECTORY" = "" ];
-then
-    SD_EXT_DIRECTORY=/sd-ext;
-fi;
-
-if ! awk -vDIR="$SD_EXT_DIRECTORY" '$2 == DIR { exit 1; }' /proc/mounts ;
-then
-    # create directories if necessary.
-    for i in app app-private dalvik-cache;
-    do
-        if [ ! -d $SD_EXT_DIRECTORY/$i ];
-        then
-            mkdir $SD_EXT_DIRECTORY/$i;
-            busybox chown 1000:1000 $SD_EXT_DIRECTORY/$i;
-            busybox chmod 771 $SD_EXT_DIRECTORY/$i;
-            log -p i -t a2sd "$SD_EXT_DIRECTORY/$i created"
-        fi;
-    done
-    setprop cm.a2sd.active 1
-    log -p i -t a2sd "Apps2SD successfully activated";
-fi;
diff --git a/prebuilt/common/etc/init.d/20userinit b/prebuilt/common/etc/init.d/20userinit
deleted file mode 100755
index 8527576..0000000
--- a/prebuilt/common/etc/init.d/20userinit
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/system/bin/sh
-# call a userinit.sh script if it's present on the sdcard
-
-if [ "$SD_EXT_DIRECTORY" = "" ];
-then
-    SD_EXT_DIRECTORY=/sd-ext;
-fi;
-
-if [ -e $SD_EXT_DIRECTORY/userinit.sh ];
-then
-   log -p i -t userinit "Executing $SD_EXT_DIRECTORY/userinit.sh";
-   busybox chmod +x $SD_EXT_DIRECTORY/userinit.sh;
-   logwrapper /system/bin/sh $SD_EXT_DIRECTORY/userinit.sh;
-   setprop cm.userinit.active 1;
-fi;
-
-if [ -d $SD_EXT_DIRECTORY/userinit.d ];
-then
-   logwrapper busybox run-parts $SD_EXT_DIRECTORY/userinit.d;
-   setprop cm.userinit.active 1;
-fi;
-
-if [ -e /data/local/userinit.sh ];
-then
-   log -p i -t userinit "Executing /data/local/userinit.sh";
-   busybox chmod +x /data/local/userinit.sh;
-   logwrapper /system/bin/sh /data/local/userinit.sh;
-   setprop cm.userinit.active 1;
-fi;
-
-if [ -d /data/local/userinit.d ];
-then
-   logwrapper busybox run-parts /data/local/userinit.d;
-   setprop cm.userinit.active 1;
-fi;
\ No newline at end of file
diff --git a/prebuilt/common/etc/permissions/com.tmobile.software.themes.xml b/prebuilt/common/etc/permissions/com.tmobile.software.themes.xml
deleted file mode 100644
index f1c2f54..0000000
--- a/prebuilt/common/etc/permissions/com.tmobile.software.themes.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The CyanogenMod Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<permissions>
-    <feature name="com.tmobile.software.themes" />
-</permissions>
-
diff --git a/prebuilt/common/etc/profile b/prebuilt/common/etc/profile
deleted file mode 100644
index 1e87441..0000000
--- a/prebuilt/common/etc/profile
+++ /dev/null
@@ -1 +0,0 @@
-ENV=/sd-ext/.profile
diff --git a/prebuilt/common/etc/resolv.conf b/prebuilt/common/etc/resolv.conf
deleted file mode 100644
index 276c26b..0000000
--- a/prebuilt/common/etc/resolv.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-nameserver 8.8.8.8
-nameserver 8.8.4.4
diff --git a/prebuilt/common/etc/sysctl.conf b/prebuilt/common/etc/sysctl.conf
deleted file mode 100644
index e69de29..0000000
--- a/prebuilt/common/etc/sysctl.conf
+++ /dev/null
diff --git a/prebuilt/common/etc/terminfo/l/linux b/prebuilt/common/etc/terminfo/l/linux
deleted file mode 100644
index 0b36f01..0000000
--- a/prebuilt/common/etc/terminfo/l/linux
+++ /dev/null
Binary files differ
diff --git a/prebuilt/common/etc/terminfo/u/unknown b/prebuilt/common/etc/terminfo/u/unknown
deleted file mode 100644
index 0b36f01..0000000
--- a/prebuilt/common/etc/terminfo/u/unknown
+++ /dev/null
Binary files differ
diff --git a/prebuilt/common/lib/libncurses.so b/prebuilt/common/lib/libncurses.so
deleted file mode 100644
index 0e3d431..0000000
--- a/prebuilt/common/lib/libncurses.so
+++ /dev/null
Binary files differ
diff --git a/prebuilt/common/xbin/bash b/prebuilt/common/xbin/bash
deleted file mode 100755
index 9d9f572..0000000
--- a/prebuilt/common/xbin/bash
+++ /dev/null
Binary files differ
diff --git a/prebuilt/common/xbin/dropbear-keygen b/prebuilt/common/xbin/dropbear-keygen
deleted file mode 100644
index c61de42..0000000
--- a/prebuilt/common/xbin/dropbear-keygen
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/system/bin/sh
-#
-# Generate keys for the Dropbear SSH server
-# Steve Kondik (cyanogen)
-#
-
-DROPBEAR_HOME=/data/dropbear
-DROPBEARKEY=/system/xbin/dropbearkey
-
-if [ ! -d $DROPBEAR_HOME ] || [ ! -f $DROPBEAR_HOME/dropbear_rsa_host_key ] || [ ! -f $DROPBEAR_HOME/dropbear_dsa_host_key ];
-then
-    if [ ! -d $DROPBEAR_HOME ];
-    then
-        mkdir /data/dropbear;
-        chmod 750 /data/dropbear
-    fi
-    for k in dss rsa;
-    do
-        if [ ! -e $DROPBEAR_HOME/dropbear_${k}_host_key ];
-        then
-            $DROPBEARKEY -t $k -f $DROPBEAR_HOME/dropbear_${k}_host_key;
-            chmod 640 $DROPBEAR_HOME/dropbear_${k}_host_key;
-        fi
-    done
-fi
diff --git a/prebuilt/common/xbin/htop b/prebuilt/common/xbin/htop
deleted file mode 100755
index daf4d23..0000000
--- a/prebuilt/common/xbin/htop
+++ /dev/null
Binary files differ
diff --git a/prebuilt/common/xbin/irssi b/prebuilt/common/xbin/irssi
deleted file mode 100755
index d2a7195..0000000
--- a/prebuilt/common/xbin/irssi
+++ /dev/null
Binary files differ
diff --git a/prebuilt/common/xbin/nano b/prebuilt/common/xbin/nano
deleted file mode 100755
index 67dc091..0000000
--- a/prebuilt/common/xbin/nano
+++ /dev/null
Binary files differ
diff --git a/prebuilt/common/xbin/openvpn-up.sh b/prebuilt/common/xbin/openvpn-up.sh
deleted file mode 100644
index 98bb439..0000000
--- a/prebuilt/common/xbin/openvpn-up.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/system/xbin/bash
-#
-# /system/xbin/openvpn-up.sh v0.2
-#
-# Philip Freeman <philip.freeman@gmail.com>
-#
-# TODO: add support for grabbing search domains ?
-#
-# Changes:
-#-- v0.2
-# - Added system logging
-# - Fixed fome path issues
-#
-
-LOG="/system/bin/log -t openvpn-up"
-SETPROP=/system/bin/setprop
-EXPR=/system/xbin/expr
-stop=0
-dns_num=1
-i=0
-
-${LOG} "Starting..."
-
-eval opt=\$foreign_option_$i
-
-while [ ${stop} -eq 0 ]; do
-  if [ "`${EXPR} substr "$opt" 1 11`" = "dhcp-option" ]; then
-    if [ "`${EXPR} substr "$opt" 13 3`" = "DNS" ]; then
-      DNS="`${EXPR} substr "$opt" 17 1024`"
-      ${LOG} "Got DNS${dns_num}: ${DNS}"
-      if [ ${dns_num} -le 2 ]; then
-	#Set it
-	${LOG} ${SETPROP} vpn.dns${dns_num} ${DNS}
-	${SETPROP} vpn.dns${dns_num} ${DNS}
-      fi
-      dns_num=$(( ${dns_num}+1 ))
-    fi
-  fi
-  i=$(( $i+1 ))
-  eval opt=\$foreign_option_$i
-  if [ "$opt" = "" ]; then
-    stop=1
-  fi
-done
diff --git a/prebuilt/common/xbin/powertop b/prebuilt/common/xbin/powertop
deleted file mode 100755
index 9ab9d08..0000000
--- a/prebuilt/common/xbin/powertop
+++ /dev/null
Binary files differ
diff --git a/prebuilt/dream_sapphire/etc/AudioPara_dream.csv b/prebuilt/dream_sapphire/etc/AudioPara_dream.csv
deleted file mode 100644
index f702821..0000000
--- a/prebuilt/dream_sapphire/etc/AudioPara_dream.csv
+++ /dev/null
@@ -1,143 +0,0 @@
-Header,Dream_TMU_20090305
-A0,HTC_VOC_CODEC_EARCUPLE_VOICE,35,71,36,61,37,0,38,0,39,3,3A,0,3B,0,3C,0,3D,0,3E,0,3F,0,40,0,41,1C,42,0,43,0,44,0,45,0,46,0,47,0,48,0,49,0,4A,1,4B,0,4C,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-A1,HTC_VOC_CODEC_EARCUPLE_MIDI,35,71,36,61,37,0,38,0,39,3,3A,0,3B,0,3C,0,3D,0,3E,0,3F,0,40,0,41,1C,42,0,43,0,44,0,45,0,46,0,47,0,48,0,49,0,4A,1,4B,0,4C,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-A2,HTC_VOC_CODEC_SPEAKER_VOICE,35,63,36,63,37,0,38,0,39,3,3A,0,3B,0,3C,0,3D,0,3E,0,3F,0,40,0,41,0,42,0,43,0,44,0,45,0,46,0,47,0,48,0,49,0,4A,18,4B,0,4C,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-A3,HTC_VOC_CODEC_SPEAKER_MIDI,35,63,36,63,37,0,38,0,39,3,3A,0,3B,0,3C,0,3D,0,3E,0,3F,0,40,0,41,0,42,0,43,0,44,0,45,0,46,0,47,0,48,0,49,0,4A,18,4B,0,4C,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-A4,HTC_VOC_CODEC_HEADSET_VOICE,35,69,36,69,37,0,38,0,39,3,3A,80,3B,0,3C,0,3D,0,3E,0,3F,0,40,0,41,1C,42,0,43,0,44,0,45,0,46,0,47,0,48,0,49,0,4A,6,4B,0,4C,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-A5,HTC_VOC_CODEC_HEADSET_MIDI,35,69,36,69,37,0,38,0,39,3,3A,80,3B,0,3C,0,3D,0,3E,0,3F,0,40,0,41,1C,42,0,43,0,44,0,45,0,46,0,47,0,48,0,49,0,4A,6,4B,0,4C,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-A6,HTC_VOC_CODEC_BT_VOICE,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-A7,HTC_VOC_CODEC_BT_MIDI,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-A8,HTC_VOC_CODEC_CARKIT_VOICE,35,69,36,69,37,0,38,0,39,3,3A,80,3B,0,3C,0,3D,0,3E,0,3F,0,40,0,41,1C,42,0,43,0,44,0,45,0,46,0,47,0,48,0,49,0,4A,6,4B,0,4C,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-A9,HTC_VOC_CODEC_CARKIT_MIDI,35,69,36,69,37,0,38,0,39,3,3A,80,3B,0,3C,0,3D,0,3E,0,3F,0,40,0,41,1C,42,0,43,0,44,0,45,0,46,0,47,0,48,0,49,0,4A,6,4B,0,4C,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-A10,HTC_VOC_CODEC_TTY_FULL_VOICE,35,69,36,69,37,0,38,0,39,3,3A,80,3B,0,3C,0,3D,0,3E,0,3F,0,40,0,41,1C,42,0,43,0,44,0,45,0,46,0,47,0,48,0,49,0,4A,6,4B,0,4C,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-A11,HTC_VOC_CODEC_TTY_FULL_MIDI,35,69,36,69,37,0,38,0,39,3,3A,80,3B,0,3C,0,3D,0,3E,0,3F,0,40,0,41,1C,42,0,43,0,44,0,45,0,46,0,47,0,48,0,49,0,4A,6,4B,0,4C,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-A12,HTC_VOC_CODEC_TTY_VCO_VOICE,35,69,36,69,37,0,38,0,39,3,3A,80,3B,0,3C,0,3D,0,3E,0,3F,0,40,0,41,1C,42,0,43,0,44,0,45,0,46,0,47,0,48,0,49,0,4A,6,4B,0,4C,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-A13,HTC_VOC_CODEC_TTY_VCO_MIDI,35,69,36,69,37,0,38,0,39,3,3A,80,3B,0,3C,0,3D,0,3E,0,3F,0,40,0,41,1C,42,0,43,0,44,0,45,0,46,0,47,0,48,0,49,0,4A,6,4B,0,4C,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-A14,HTC_VOC_CODEC_TTY_HCO_VOICE,35,71,36,61,37,0,38,0,39,3,3A,0,3B,0,3C,0,3D,0,3E,0,3F,0,40,0,41,1C,42,0,43,0,44,0,45,0,46,0,47,0,48,0,49,0,4A,1,4B,0,4C,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-A15,HTC_VOC_CODEC_TTY_HCO_MIDI,35,71,36,61,37,0,38,0,39,3,3A,0,3B,0,3C,0,3D,0,3E,0,3F,0,40,0,41,1C,42,0,43,0,44,0,45,0,46,0,47,0,48,0,49,0,4A,1,4B,0,4C,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-A16,HTC_VOC_CODEC_NO_MIC_HEADSET_VOICE,35,69,36,69,37,0,38,0,39,3,3A,80,3B,0,3C,0,3D,0,3E,0,3F,0,40,0,41,1C,42,0,43,0,44,0,45,0,46,0,47,0,48,0,49,0,4A,6,4B,0,4C,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-A17,HTC_VOC_CODEC_NO_MIC_HEADSET_MIDI,35,69,36,69,37,0,38,0,39,3,3A,80,3B,0,3C,0,3D,0,3E,0,3F,0,40,0,41,1C,42,0,43,0,44,0,45,0,46,0,47,0,48,0,49,0,4A,6,4B,0,4C,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-A18,HTC_VOC_CODEC_TBD2_VOICE,35,69,36,69,37,0,38,0,39,3,3A,80,3B,0,3C,0,3D,0,3E,0,3F,0,40,0,41,1C,42,0,43,0,44,0,45,0,46,0,47,0,48,0,49,0,4A,6,4B,0,4C,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-A19,HTC_VOC_CODEC_TBD2_MIDI,35,69,36,69,37,0,38,0,39,3,3A,80,3B,0,3C,0,3D,0,3E,0,3F,0,40,0,41,1C,42,0,43,0,44,0,45,0,46,0,47,0,48,0,49,0,4A,6,4B,0,4C,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-A20,HTC_VOC_CODEC_HEADSET_SPEAKER_VOICE,35,6B,36,6B,37,0,38,0,39,3,3A,80,3B,0,3C,0,3D,0,3E,0,3F,0,40,0,41,10,42,0,43,0,44,0,45,0,46,0,47,0,48,0,49,0,4A,1E,4B,0,4C,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-A21,HTC_VOC_CODEC_HEADSET_SPEAKER_MIDI,35,6B,36,6B,37,0,38,0,39,3,3A,80,3B,0,3C,0,3D,0,3E,0,3F,0,40,0,41,10,42,0,43,0,44,0,45,0,46,0,47,0,48,0,49,0,4A,1E,4B,0,4C,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-A22,HTC_VOC_CODEC_TBD4_VOICE,35,71,36,61,37,0,38,0,39,3,3A,0,3B,0,3C,0,3D,0,3E,0,3F,0,40,0,41,1C,42,0,43,0,44,0,45,0,46,0,47,0,48,0,49,0,4A,1,4B,0,4C,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-A23,HTC_VOC_CODEC_TBD4_MIDI,35,71,36,61,37,0,38,0,39,3,3A,0,3B,0,3C,0,3D,0,3E,0,3F,0,40,0,41,1C,42,0,43,0,44,0,45,0,46,0,47,0,48,0,49,0,4A,1,4B,0,4C,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-U0,HTC_VOC_CODEC_EARCUPLE_VOICE,35,0,36,0,37,FF,38,0,39,0,3A,0,3B,0,3C,90,3D,90,3E,0,3F,80,40,5,41,0,42,1,43,0,44,0,45,0,46,0,47,0,48,0,49,0,4A,0,4B,0,4C,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-U1,HTC_VOC_CODEC_EARCUPLE_MIDI,35,0,36,0,37,FF,38,0,39,0,3A,0,3B,0,3C,84,3D,84,3E,0,3F,80,40,5,41,0,42,1,43,0,44,0,45,0,46,0,47,0,48,0,49,0,4A,0,4B,0,4C,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-U2,HTC_VOC_CODEC_SPEAKER_VOICE,35,0,36,0,37,FF,38,0,39,0,3A,0,3B,0,3C,98,3D,98,3E,0,3F,0,40,0,41,0,42,1,43,0,44,0,45,0,46,0,47,0,48,0,49,0,4A,0,4B,0,4C,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-U3,HTC_VOC_CODEC_SPEAKER_MIDI,35,0,36,0,37,FF,38,0,39,0,3A,0,3B,0,3C,A0,3D,A0,3E,0,3F,0,40,0,41,0,42,1,43,0,44,0,45,0,46,0,47,0,48,0,49,0,4A,0,4B,0,4C,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-U4,HTC_VOC_CODEC_HEADSET_VOICE,35,0,36,0,37,FF,38,0,39,0,3A,0,3B,0,3C,28,3D,28,3E,8,3F,80,40,5,41,0,42,1,43,0,44,0,45,0,46,0,47,0,48,0,49,0,4A,0,4B,0,4C,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-U5,HTC_VOC_CODEC_HEADSET_MIDI,35,0,36,0,37,FF,38,0,39,0,3A,0,3B,0,3C,3C,3D,3C,3E,8,3F,80,40,5,41,0,42,1,43,0,44,0,45,0,46,0,47,0,48,0,49,0,4A,0,4B,0,4C,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-U6,HTC_VOC_CODEC_BT_VOICE,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-U7,HTC_VOC_CODEC_BT_MIDI,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-U8,HTC_VOC_CODEC_CARKIT_VOICE,35,0,36,0,37,FF,38,0,39,0,3A,0,3B,0,3C,28,3D,28,3E,8,3F,80,40,5,41,0,42,0,43,0,44,0,45,0,46,0,47,0,48,0,49,0,4A,0,4B,0,4C,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-U9,HTC_VOC_CODEC_CARKIT_MIDI,35,0,36,0,37,FF,38,0,39,0,3A,0,3B,0,3C,20,3D,20,3E,8,3F,80,40,5,41,0,42,0,43,0,44,0,45,0,46,0,47,0,48,0,49,0,4A,0,4B,0,4C,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-U10,HTC_VOC_CODEC_TTY_FULL_VOICE,35,0,36,0,37,FF,38,0,39,0,3A,0,3B,0,3C,3C,3D,3C,3E,8,3F,80,40,5,41,0,42,0,43,0,44,0,45,0,46,0,47,0,48,0,49,0,4A,0,4B,0,4C,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-U11,HTC_VOC_CODEC_TTY_FULL_MIDI,35,0,36,0,37,FF,38,0,39,0,3A,0,3B,0,3C,3C,3D,3C,3E,8,3F,80,40,5,41,0,42,0,43,0,44,0,45,0,46,0,47,0,48,0,49,0,4A,0,4B,0,4C,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-U12,HTC_VOC_CODEC_TTY_VCO_VOICE,35,0,36,0,37,FF,38,0,39,0,3A,0,3B,0,3C,44,3D,44,3E,0,3F,80,40,5,41,0,42,0,43,0,44,0,45,0,46,0,47,0,48,0,49,0,4A,0,4B,0,4C,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-U13,HTC_VOC_CODEC_TTY_VCO_MIDI,35,0,36,0,37,FF,38,0,39,0,3A,0,3B,0,3C,44,3D,44,3E,0,3F,80,40,5,41,0,42,0,43,0,44,0,45,0,46,0,47,0,48,0,49,0,4A,0,4B,0,4C,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-U14,HTC_VOC_CODEC_TTY_HCO_VOICE,35,0,36,0,37,FF,38,0,39,0,3A,0,3B,0,3C,A0,3D,A0,3E,8,3F,80,40,5,41,0,42,0,43,0,44,0,45,0,46,0,47,0,48,0,49,0,4A,0,4B,0,4C,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-U15,HTC_VOC_CODEC_TTY_HCO_MIDI,35,0,36,0,37,FF,38,0,39,0,3A,0,3B,0,3C,A0,3D,A0,3E,8,3F,80,40,5,41,0,42,0,43,0,44,0,45,0,46,0,47,0,48,0,49,0,4A,0,4B,0,4C,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-U16,HTC_VOC_CODEC_NO_MIC_HEADSET_VOICE,35,0,36,0,37,FF,38,0,39,0,3A,0,3B,0,3C,28,3D,28,3E,8,3F,80,40,5,41,0,42,1,43,0,44,0,45,0,46,0,47,0,48,0,49,0,4A,0,4B,0,4C,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-U17,HTC_VOC_CODEC_NO_MIC_HEADSET_MIDI,35,0,36,0,37,FF,38,0,39,0,3A,0,3B,0,3C,3C,3D,3C,3E,8,3F,80,40,5,41,0,42,1,43,0,44,0,45,0,46,0,47,0,48,0,49,0,4A,0,4B,0,4C,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-U18,HTC_VOC_CODEC_TBD2_VOICE,35,0,36,0,37,FF,38,0,39,0,3A,0,3B,0,3C,A0,3D,A0,3E,8,3F,80,40,5,41,0,42,0,43,0,44,0,45,0,46,0,47,0,48,0,49,0,4A,0,4B,0,4C,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-U19,HTC_VOC_CODEC_TBD2_MIDI,35,0,36,0,37,FF,38,0,39,0,3A,0,3B,0,3C,A0,3D,A0,3E,8,3F,80,40,5,41,0,42,0,43,0,44,0,45,0,46,0,47,0,48,0,49,0,4A,0,4B,0,4C,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-U20,HTC_VOC_CODEC_HEADSET_SPEAKER_VOICE,35,0,36,0,37,FF,38,0,39,0,3A,0,3B,0,3C,44,3D,44,3E,0,3F,80,40,5,41,0,42,1,43,0,44,0,45,0,46,0,47,0,48,0,49,0,4A,0,4B,0,4C,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-U21,HTC_VOC_CODEC_HEADSET_SPEAKER_MIDI,35,0,36,0,37,FF,38,0,39,0,3A,0,3B,0,3C,44,3D,44,3E,0,3F,80,40,5,41,0,42,1,43,0,44,0,45,0,46,0,47,0,48,0,49,0,4A,0,4B,0,4C,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-U22,HTC_VOC_CODEC_TBD4_VOICE,35,0,36,0,37,FF,38,0,39,0,3A,0,3B,0,3C,C4,3D,C4,3E,8,3F,80,40,5,41,0,42,0,43,0,44,0,45,0,46,0,47,0,48,0,49,0,4A,0,4B,0,4C,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-U23,HTC_VOC_CODEC_TBD4_MIDI,35,0,36,0,37,FF,38,0,39,0,3A,0,3B,0,3C,C4,3D,C4,3E,8,3F,80,40,5,41,0,42,0,43,0,44,0,45,0,46,0,47,0,48,0,49,0,4A,0,4B,0,4C,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-D0,HTC_VOC_CODEC_EARCUPLE_VOICE,1,2,22,0,818,0,0,0,0,0
-D1,HTC_VOC_CODEC_EARCUPLE_MIDI,1,6,22,0,818,0,0,0,0,0
-D2,HTC_VOC_CODEC_SPEAKER_VOICE,1,2,22,0,818,0,0,0,0,0
-D3,HTC_VOC_CODEC_SPEAKER_MIDI,1,6,22,0,818,0,0,0,0,0
-D4,HTC_VOC_CODEC_HEADSET_VOICE,1,2,22,0,818,0,0,c,0,0
-D5,HTC_VOC_CODEC_HEADSET_MIDI,1,6,22,0,818,0,0,c,0,0
-D6,HTC_VOC_CODEC_BT_VOICE,4002,0,22,3,800,0,1,0,0,0
-D7,HTC_VOC_CODEC_BT_MIDI,4002,0,22,3,800,0,1,0,0,0
-D8,HTC_VOC_CODEC_CARKIT_VOICE,1,7,22,0,818,0,0,0,0,0
-D9,HTC_VOC_CODEC_CARKIT_MIDI,1,7,22,0,818,0,0,0,0,0
-D10,HTC_VOC_CODEC_TTY_FULL_VOICE,1,7,22,0,818,0,0,0,0,0
-D11,HTC_VOC_CODEC_TTY_FULL_MIDI,1,7,22,0,818,0,0,0,0,0
-D12,HTC_VOC_CODEC_TTY_VCO_VOICE,1,7,22,0,818,0,0,0,0,0
-D13,HTC_VOC_CODEC_TTY_VCO_MIDI,1,7,22,0,818,0,0,0,0,0
-D14,HTC_VOC_CODEC_TTY_HCO_VOICE,1,7,22,0,818,0,0,0,0,0
-D15,HTC_VOC_CODEC_TTY_HCO_MIDI,1,7,22,0,818,0,0,0,0,0
-D16,HTC_VOC_CODEC_NO_MIC_HEADSET_VOICE,1,2,22,0,818,0,0,c,0,0
-D17,HTC_VOC_CODEC_NO_MIC_HEADSET_MIDI,1,6,22,0,818,0,0,c,0,0
-D18,HTC_VOC_CODEC_TBD2_VOICE,1,7,22,0,818,0,0,0,0,0
-D19,HTC_VOC_CODEC_TBD2_MIDI,1,7,22,0,818,0,0,0,0,0
-D20,HTC_VOC_CODEC_HEADSET_SPEAKER_VOICE,1,7,22,0,818,0,0,0,0,0
-D21,HTC_VOC_CODEC_HEADSET_SPEAKER_MIDI,1,7,22,0,818,0,0,0,0,0
-D22,HTC_VOC_CODEC_TBD4_VOICE,1,7,22,0,818,0,0,0,0,0
-D23,HTC_VOC_CODEC_TBD4_MIDI,1,7,22,0,818,0,0,0,0,0
-F0,PHONE_HEADSET_VOL0,0,4000,2013,0,7FB2,23FD,0,2D33,0,C80,FF9A,1D80,F333,01EC,FFEE,200A,7F65,0,ED00,0,0,3FD9,0,C80,FF9A,1B0C,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,149f,0,14,800,2000,2000,fa,46,2,2ff,40,20,4650,40,41a0,800,63,4DFF,4DFF,2,3F00,7D0,0,0,100,100,200,50,300,150,64,1ca8,1c2,2ee0,fa0,FFFF,0,0,0,0,0,0,4000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-F1,PHONE_HEADSET_VOL1,1,4000,2861,0,7FB2,2D4E,0,2D33,0,C80,FF9A,1D80,F333,01EC,FFEE,200A,7F65,0,ED00,0,0,3FD9,0,C80,FF9A,1B0C,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,149f,0,14,800,2000,2000,fa,46,2,2ff,40,20,4650,40,41a0,800,63,4DFF,4DFF,2,3F00,7D0,0,0,100,100,200,50,300,150,64,1ca8,1c2,2ee0,fa0,FFFF,0,0,0,0,0,0,4000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-F2,PHONE_HEADSET_VOL2,2,4000,32D6,0,7FB2,390A,0,2D33,0,C80,FF9A,1D80,F333,01EC,FFEE,200A,7F65,0,ED00,0,0,3FD9,0,C80,FF9A,1B0C,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,149f,0,14,800,2000,2000,fa,46,2,2ff,40,20,4650,40,41a0,800,63,4DFF,4DFF,2,3F00,7D0,0,0,100,100,200,50,300,150,64,1ca8,1c2,2ee0,fa0,FFFF,0,0,0,0,0,0,4000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-F3,PHONE_HEADSET_VOL3,3,4000,4000,0,7FB2,47CF,0,2D33,0,C80,FF9A,1D80,F333,01EC,FFEE,200A,7F65,0,ED00,0,0,3FD9,0,C80,FF9A,1B0C,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,149f,0,14,800,2000,2000,fa,46,2,2ff,40,20,4650,40,41a0,800,63,4DFF,4DFF,2,3F00,7D0,0,0,100,100,200,50,300,150,64,1ca8,1c2,2ee0,fa0,FFFF,0,0,0,0,0,0,4000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-F4,PHONE_HEADSET_VOL4,4,4000,4000,0,7FB2,71CF,0,2D33,0,C80,FF9A,1D80,F333,01EC,FFEE,200A,7F65,0,ED00,0,0,3FD9,0,C80,FF9A,1B0C,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,149f,0,14,800,2000,2000,fa,46,2,2ff,40,20,4650,40,41a0,800,63,4DFF,4DFF,2,3F00,7D0,0,0,100,100,200,50,300,150,64,1ca8,1c2,2ee0,fa0,FFFF,0,0,0,0,0,0,4000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-F5,PHONE_HEADSET_VOL5,5,4000,4000,0,7FB2,B45F,FFFF,2D33,0,C80,FF9A,1D80,F333,01EC,FFEE,200A,7F65,0,ED00,0,0,3FD9,0,C80,FF9A,1B0C,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,149f,0,14,800,2000,2000,fa,46,2,2ff,40,20,4650,40,41a0,800,63,4DFF,4DFF,2,3F00,7D0,0,0,100,100,200,50,300,258,64,1ca8,1c2,2ee0,fa0,FFFF,0,FF68,FB13,FC56,114,EDCE,47FB,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-F6,PHONE_HANDSFREE_VOL0,0,4000,143D,0,2861,7FB2,FFFF,3FD9,0,C80,FF9A,2050,F333,01EC,FFEE,200A,7F65,0,ED00,0,FFFF,3FD9,0,1180,FF9A,1D80,F333,01EC,FFEE,200A,7F65,6000,800,7fff,179f,0,14,2000,2000,2000,80,8c,2,190,40,20,4650,40,41a0,800,63,4DFF,4DFF,2,3600,7D0,0,50,100,200,200,200,300,200,64,1ca8,300,800,fa0,FFFF,0,FF3F,FC68,F8C8,F8EF,FDA1,4027,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-F7,PHONE_HANDSFREE_VOL1,1,4000,143D,0,2861,B45F,FFFF,3FD9,0,C80,FF9A,2050,F333,01EC,FFEE,200A,7F65,0,ED00,0,FFFF,3FD9,0,1180,FF9A,1D80,F333,01EC,FFEE,200A,7F65,6000,800,7fff,179f,0,14,2000,2000,2000,80,8c,2,190,40,20,4650,40,41a0,800,63,4DFF,4DFF,2,3600,7D0,0,50,100,200,200,200,300,200,64,1ca8,300,800,fa0,FFFF,0,FF3F,FC68,F8C8,F8EF,FDA1,4027,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-F8,PHONE_HANDSFREE_VOL2,2,4000,143D,0,2861,FEC9,FFFF,3FD9,0,C80,FF9A,2050,F333,01EC,FFEE,200A,7F65,0,ED00,0,FFFF,3FD9,0,1180,FF9A,1D80,F333,01EC,FFEE,200A,7F65,6000,800,7fff,179f,0,14,2000,2000,2000,80,8c,2,190,40,20,4650,40,41a0,800,63,4DFF,4DFF,2,3600,7D0,0,50,100,200,200,200,300,200,64,1ca8,300,800,fa0,FFFF,0,FF3F,FC68,F8C8,F8EF,FDA1,4027,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-F9,PHONE_HANDSFREE_VOL3,3,4000,1C96,0,2861,FEC9,FFFF,3FD9,0,C80,FF9A,2050,F333,01EC,FFEE,200A,7F65,0,ED00,0,FFFF,3FD9,0,1180,FF9A,1D80,F333,01EC,FFEE,200A,7F65,6000,800,7fff,179f,0,14,2000,2000,2000,80,8c,2,190,40,20,4650,40,41a0,800,63,4DFF,4DFF,2,3F00,7D0,0,50,100,100,200,100,300,200,64,1ca8,300,800,fa0,FFFF,0,FF3F,FC68,F8C8,F8EF,FDA1,4027,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-F10,PHONE_HANDSFREE_VOL4,4,4000,2D4E,0,2861,FEC9,FFFF,3FD9,0,C80,FF9A,2050,F333,01EC,FFEE,200A,7F65,0,ED00,0,FFFF,3FD9,0,1180,FF9A,1D80,F333,01EC,FFEE,200A,7F65,32F4,800,7fff,179f,0,14,2000,2000,2000,80,8c,2,190,40,20,4650,40,41a0,800,63,4DFF,4DFF,2,3F00,bb8,0,100,100,200,400,200,300,200,64,1ca8,300,800,fa0,FFFF,0,FF3F,FC68,F8C8,F8EF,FDA1,4027,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-F11,PHONE_HANDSFREE_VOL5,5,4000,4000,0,2861,FEC9,FFFF,3FD9,0,C80,FF9A,2050,F333,01EC,FFEE,200A,7F65,0,ED00,0,FFFF,3FD9,0,1180,FF9A,1D80,F333,01EC,FFEE,5A67,7F65,32F4,800,7fff,179f,0,14,2000,2000,2000,80,8c,2,190,40,20,4650,40,41a0,800,63,4DFF,4DFF,2,4A38,bb8,0,100,100,400,500,200,300,200,64,1ca8,300,800,fa0,FFFF,0,FF3F,FC68,F8C8,F8EF,FDA1,4027,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-F12,PHONE_EARCUPLE_VOL0,0,4000,4000,0,4000,1209,FFFF,2D33,0,780,FF9A,1D80,F333,01EC,FFEE,200A,7F65,0,ED00,0,0,2D33,0,780,FF9A,1B0C,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,149f,0,14,1000,1500,2000,fa,46,2,2ff,40,20,4650,40,41a0,800,63,4DFF,4DFF,2,3F00,7D0,0,0,100,200,200,50,300,150,64,1388,1c2,2ee0,fa0,FFFF,0,CB,FECB,5D5,D75,69D,3C90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-F13,PHONE_EARCUPLE_VOL1,1,4000,4000,0,4000,197A,FFFF,2D33,0,780,FF9A,1D80,F333,01EC,FFEE,200A,7F65,0,ED00,0,0,2D33,0,780,FF9A,1B0C,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,149f,0,14,1000,1500,2000,fa,46,2,2ff,40,20,4650,40,41a0,800,63,4DFF,4DFF,2,3F00,7D0,0,0,100,200,200,50,300,150,64,1388,1c2,2ee0,fa0,FFFF,0,CB,FECB,5D5,D75,69D,3C90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-F14,PHONE_EARCUPLE_VOL2,2,4000,4000,0,4000,23FD,FFFF,2D33,0,780,FF9A,1D80,F333,01EC,FFEE,200A,7F65,0,ED00,0,0,2D33,0,780,FF9A,1B0C,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,149f,0,14,1000,1500,2000,fa,46,2,2ff,40,20,4650,40,41a0,800,63,4DFF,4DFF,2,3F00,7D0,0,0,100,200,200,50,300,150,64,1388,1c2,2ee0,fa0,FFFF,0,CB,FECB,5D5,D75,69D,3C90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-F15,PHONE_EARCUPLE_VOL3,3,4000,4000,0,4000,32D6,FFFF,2D33,0,780,FF9A,1D80,F333,01EC,FFEE,200A,7F65,0,ED00,0,0,2D33,0,780,FF9A,1B0C,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,149f,0,14,1000,1500,2000,fa,46,2,2ff,40,20,4650,40,41a0,800,63,4DFF,4DFF,2,3F00,7D0,0,0,100,200,200,50,300,150,64,1388,1c2,2ee0,fa0,FFFF,0,CB,FECB,5D5,D75,69D,3C90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-F16,PHONE_EARCUPLE_VOL4,4,4000,4000,0,4000,5092,FFFF,2D33,0,780,FF9A,1D80,F333,01EC,FFEE,200A,7F65,0,ED00,0,0,2D33,0,780,FF9A,1B0C,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,149f,0,14,1000,1500,2000,fa,46,2,2ff,40,20,4650,40,41a0,800,63,4DFF,4DFF,2,3F00,7D0,0,0,100,200,200,50,300,200,64,1388,1c2,2ee0,fa0,FFFF,0,197,FE36,711,FEEB,FFD5,3C90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-F17,PHONE_EARCUPLE_VOL5,5,4000,4000,0,4000,71CF,FFFF,2D33,0,780,FF9A,1D80,F333,01EC,FFEE,200A,7F65,0,ED00,0,0,2D33,0,780,FF9A,1B0C,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,149f,0,14,1000,1500,2000,fa,46,2,2ff,40,20,4650,40,41a0,800,63,4DFF,4DFF,2,3F00,7D0,0,0,100,200,200,50,300,200,64,1388,1c2,2ee0,fa0,FFFF,0,197,FE36,711,FEEB,FFD5,3C90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-F18,PHONE_BTHEADSET,5,4000,4000,0,7FB2,7FB2,0,2D33,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,0,ED00,0,0,3FD9,0,C80,FF1A,1B0C,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,179f,0,20,800,2000,2000,fa,C8,1,190,40,20,3977,40,408A,800,63,4DFF,4DFF,2,5208,1F40,0,106,161,800,200,1912,300,258,32,1ca8,C8,2D55,100,FFFF,0,FF80,FBDB,FCEB,E8,F0B1,3C90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-F19,PHONE_CARKIT,5,4000,4000,0,7FB2,5A67,0,7F65,0,780,FF9A,1B0C,F333,01EC,FFEE,200A,7F65,0,ED00,0,0,7F65,0,780,FF9A,1B0C,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,149f,0,14,800,2000,2000,fa,46,1,2ff,40,20,4650,40,41a0,800,63,4DFF,4DFF,1,4a38,1770,0,100,100,400,200,400,300,258,190,1ca8,1c2,2ee0,fa0,FFFF,417,FC95,60,EC7D,01D8,F16B,3D23,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-F20,PHONE_TTY_FULL,0,4000,4000,0,4000,4000,0,7F65,0,780,FF9A,1B0C,F333,01EC,FFEE,200A,7F65,0,ED00,0,0,7F65,0,780,FF9A,1B0C,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,0,0,14,800,2000,2000,fa,46,1,2ff,40,20,4650,40,41a0,800,63,4DFF,4DFF,1,4a38,1770,0,100,100,400,200,400,300,258,190,1ca8,1c2,2ee0,fa0,FFFF,4000,0,0,0,0,0,0,FFFF,91,316,400,FF03,17BF,3C90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-F21,PHONE_TTY_VCO,0,4000,2600,0,4000,4000,0,7F65,0,780,FF9A,1B0C,F333,01EC,FFEE,200A,7F65,0,ED00,0,0,7F65,0,780,FF9A,1B0C,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,0,0,14,800,2000,2000,fa,46,1,2ff,40,20,4650,40,41a0,800,63,4DFF,4DFF,1,4a38,1770,0,100,100,400,200,400,300,258,190,1ca8,1c2,2ee0,fa0,FFFF,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-F22,PHONE_TTY_HCO,0,4000,4000,0,4000,5A67,0,7F65,0,780,FF9A,1B0C,F333,01EC,FFEE,200A,7F65,0,ED00,0,0,7F65,0,780,FF9A,1B0C,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,0,0,14,800,2000,2000,fa,46,1,2ff,40,20,4650,40,41a0,800,63,4DFF,4DFF,1,4a38,1770,0,100,100,400,200,400,300,258,190,1ca8,1c2,2ee0,fa0,FFFF,FB93,FBF6,F2C6,FDCC,93,141F,382A,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-F23,CE_REC_INC_MIC,5,4000,4000,0,4000,4000,0,7F65,0,780,FF9A,1B0C,F333,01EC,FFEE,200A,7F65,0,ED00,0,0,7F65,0,780,FF9A,1B0C,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,0,0,14,800,2000,2000,fa,46,1,2ff,40,20,4650,40,41a0,800,63,4DFF,4DFF,1,4a38,1770,0,100,100,400,200,400,300,258,190,1ca8,1c2,2ee0,fa0,FFFF,0,0,0,0,0,0,0,FFFF,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-F24,CE_REC_EXT_MIC,5,4000,4000,0,4000,4000,0,7F65,0,780,FF9A,1B0C,F333,01EC,FFEE,200A,7F65,0,ED00,0,0,7F65,0,780,FF9A,1B0C,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,0,0,14,800,2000,2000,fa,46,1,2ff,40,20,4650,40,41a0,800,63,4DFF,4DFF,1,4a38,1770,0,100,100,400,200,400,300,258,190,1ca8,1c2,2ee0,fa0,FFFF,0,0,0,0,0,0,0,FFFF,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-F25,CE_PLAYBACK_HEADSET,5,4000,2FFC,0,4000,4000,0,7F65,0,780,FF9A,1B0C,F333,01EC,FFEE,200A,7F65,0,ED00,0,0,7F65,0,780,FF9A,1B0C,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,0,0,14,800,2000,2000,fa,46,1,2ff,40,20,4650,40,41a0,800,63,4DFF,4DFF,1,4a38,1770,0,100,100,400,200,400,300,258,190,1ca8,1c2,2ee0,fa0,FFFF,0,0,0,0,0,0,0,FFFF,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-F26,CE_PLAYBACK_HANDSFREE,5,4000,5500,0,4000,4000,0,7F65,0,780,FF9A,1B0C,F333,01EC,FFEE,200A,7F65,0,ED00,0,0,7F65,0,780,FF9A,1B0C,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,0,0,14,800,2000,2000,fa,46,1,2ff,40,20,4650,40,41a0,800,63,4DFF,4DFF,1,4a38,1770,0,100,100,400,200,400,300,258,190,1ca8,1c2,2ee0,fa0,FFFF,0,0,0,0,0,0,0,FFFF,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-F27,CE_SYS,5,4000,4000,0,4000,4000,0,7F65,0,780,FF9A,1B0C,F333,01EC,FFEE,200A,7F65,0,ED00,0,0,7F65,0,780,FF9A,1B0C,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,149f,0,14,800,2000,2000,00fa,46,1,2ff,40,20,4650,40,41a0,800,63,4DFF,4DFF,1,4a38,1770,0,100,100,400,200,400,300,258,190,1ca8,1c2,2ee0,fa0,FFFF,0,0,0,0,0,0,0,FFFF,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-F28,VT_HANDSFREE_VOL0,0,4000,143D,0,2013,7FB2,FFFF,3FD9,0,C80,FF9A,2050,F333,01EC,FFEE,200A,7F65,0,ED00,0,FFFF,3FD9,0,1180,FF9A,1D80,F333,01EC,FFEE,200A,7F65,6000,800,7fff,179f,0,14,2000,2000,2000,80,8c,2,190,40,20,4650,40,41a0,800,63,4DFF,4DFF,2,3600,7D0,0,50,100,200,200,200,300,200,64,1ca8,300,800,fa0,FFFF,0,0,0,0,0,0,5000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-F29,VT_HANDSFREE_VOL1,1,4000,143D,0,2013,B45F,FFFF,3FD9,0,C80,FF9A,2050,F333,01EC,FFEE,200A,7F65,0,ED00,0,FFFF,3FD9,0,1180,FF9A,1D80,F333,01EC,FFEE,200A,7F65,6000,800,7fff,179f,0,14,2000,2000,2000,80,8c,2,190,40,20,4650,40,41a0,800,63,4DFF,4DFF,2,3600,7D0,0,50,100,200,200,200,300,200,64,1ca8,300,800,fa0,FFFF,0,0,0,0,0,0,5000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-F30,VT_HANDSFREE_VOL2,2,4000,143D,0,2013,FEC9,FFFF,3FD9,0,C80,FF9A,2050,F333,01EC,FFEE,200A,7F65,0,ED00,0,FFFF,3FD9,0,1180,FF9A,1D80,F333,01EC,FFEE,200A,7F65,6000,800,7fff,179f,0,14,2000,2000,2000,80,8c,2,190,40,20,4650,40,41a0,800,63,4DFF,4DFF,2,3600,7D0,0,50,100,200,200,200,300,200,64,1ca8,300,800,fa0,FFFF,0,0,0,0,0,0,5000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-F31,VT_HANDSFREE_VOL3,3,4000,1C96,0,2013,FEC9,FFFF,3FD9,0,C80,FF9A,2050,F333,01EC,FFEE,200A,7F65,0,ED00,0,FFFF,3FD9,0,1180,FF9A,1D80,F333,01EC,FFEE,200A,7F65,6000,800,7fff,179f,0,14,2000,2000,2000,80,8c,2,190,40,20,4650,40,41a0,800,63,4DFF,4DFF,2,3F00,7D0,0,50,100,100,200,100,300,200,64,1ca8,300,800,fa0,FFFF,0,0,0,0,0,0,5000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-F32,VT_HANDSFREE_VOL4,4,4000,2D4E,0,2013,FEC9,FFFF,3FD9,0,C80,FF9A,2050,F333,01EC,FFEE,200A,7F65,0,ED00,0,FFFF,3FD9,0,1180,FF9A,1D80,F333,01EC,FFEE,200A,7F65,32F4,800,7fff,179f,0,14,2000,2000,2000,80,8c,2,190,40,20,4650,40,41a0,800,63,4DFF,4DFF,2,3F00,bb8,0,100,100,200,400,200,300,200,64,1ca8,300,800,fa0,FFFF,0,0,0,0,0,0,5000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-F33,VT_HANDSFREE_VOL5,5,4000,4000,0,2013,FEC9,FFFF,3FD9,0,C80,FF9A,2050,F333,01EC,FFEE,200A,7F65,0,ED00,0,FFFF,3FD9,0,1180,FF9A,1D80,F333,01EC,FFEE,5A67,7F65,32F4,800,7fff,179f,0,14,2000,2000,2000,80,8c,2,190,40,20,4650,40,41a0,800,63,4DFF,4DFF,2,4A38,bb8,0,100,100,400,500,200,300,200,64,1ca8,300,800,fa0,FFFF,0,0,0,0,0,0,5000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-F34,CE_PLAYBACK_HEADSET_RING,5,4000,4000,0,4000,4000,0,7F65,0,780,FF9A,1B0C,F333,01EC,FFEE,200A,7F65,0,ED00,0,0,7F65,0,780,FF9A,1B0C,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,149f,0,14,800,2000,2000,00fa,46,1,2ff,40,20,4650,40,41a0,800,63,4DFF,4DFF,1,4a38,1770,0,100,100,400,200,400,300,258,190,1ca8,1c2,2ee0,fa0,FFFF,0,0,0,0,0,0,0,FFFF,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-G0,Default,5,4000,4000,0,7FB2,7FB2,0,2D33,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,0,ED00,0,0,3FD9,0,C80,FF1A,1B0C,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,179f,0,20,800,2000,2000,fa,C8,1,190,40,20,3977,40,408A,800,63,4DFF,4DFF,2,5208,1F40,0,106,161,800,200,1912,300,258,32,1ca8,C8,2D55,100,FFFF,0,FF80,FBDB,FCEB,E8,F0B1,3C90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-G1,HTC BH S100,5,4000,4000,0,4000,7FB2,FFFF,2D33,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,0,ED00,0,FFFF,3FD9,0,C80,FF9A,1B0C,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,179f,0,14,800,2000,2000,fa,46,1,190,40,20,4650,40,41a0,800,63,4DFF,4DFF,1,3F00,7D0,0,40,100,400,200,400,300,258,32,1ca8,1c2,2EE0,fa0,FFFF,0,FF80,FBDB,FCEB,E8,F0B1,3C90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-G2,HTC BH M100,5,4000,4000,0,5A67,5A67,FFFF,3FD9,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,0,ED00,0,FFFF,3FD9,0,1180,FF1A,1D80,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,179f,0,20,800,2000,2000,fa,78,1,190,40,20,3977,40,408A,800,63,4DFF,4DFF,2,3F00,BB8,0,40,100,400,200,400,300,258,32,1ca8,C8,2D55,100,FFFF,0,FF80,FBDB,FCEB,E8,F0B1,3C90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-G3,Motorola H500,5,4000,4000,0,7FB2,7FB2,FFFF,3FD9,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,0,ED00,0,FFFF,3FD9,0,F00,FF1A,1D80,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,179f,0,20,800,2000,2000,fa,78,1,190,40,20,3977,40,408A,800,63,4DFF,4DFF,2,3F00,BB8,0,40,100,400,200,400,300,258,32,1ca8,C8,2D55,100,FFFF,0,FF80,FBDB,FCEB,E8,F0B1,3C90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-G4,Nokia HS-36W,5,4000,4000,0,7FB2,B45F,FFFF,3FD9,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,0,ED00,0,FFFF,3FD9,0,780,FF1A,1D80,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,179f,0,40,800,2000,2000,fa,78,1,190,40,20,3977,40,408A,800,63,4DFF,4DFF,2,3F00,7D0,0,20,100,200,200,400,300,258,32,1ca8,C8,2D55,100,FFFF,0,FF80,FBDB,FCEB,E8,F0B1,3C90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-G5,PLT 510v.D,5,4000,4000,0,4000,4000,FFFF,2D33,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,0,ED00,0,FFFF,3FD9,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,179f,0,20,800,2000,2000,fa,78,1,190,40,20,3977,40,408A,800,63,4DFF,4DFF,2,3F00,7D0,0,20,100,200,200,400,300,258,32,1ca8,C8,2D55,100,FFFF,0,FF80,FBDB,FCEB,E8,F0B1,3C90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-G6,M2500 by Plantronics,5,4000,4000,0,4000,4000,FFFF,2D33,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,0,ED00,0,FFFF,3FD9,0,C80,FF1A,1B0C,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,179f,0,20,800,2000,2000,fa,C8,1,190,40,20,3977,40,408A,800,63,4DFF,4DFF,2,3F00,7D0,0,20,100,400,200,400,300,258,32,1ca8,C8,2D55,100,FFFF,0,FF80,FBDB,FCEB,E8,F0B1,3C90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-G7,Nokia HDW-3,5,4000,4000,0,5092,7FB2,FFFF,2D33,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,0,ED00,0,FFFF,3FD9,0,C80,FF1A,1B0C,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,179f,0,20,800,2000,2000,fa,C8,1,190,40,20,3977,40,408A,800,63,4DFF,4DFF,2,3F00,BB8,0,40,100,200,200,400,300,258,32,1ca8,C8,2D55,100,FFFF,0,FF80,FBDB,FCEB,E8,F0B1,3C90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-G8,HBH-608,5,4000,4000,0,5A67,7FB2,FFFF,2D33,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,0,ED00,0,FFFF,3FD9,0,C80,FF1A,1B0C,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,179f,0,20,800,2000,2000,fa,C8,1,190,40,20,3977,40,408A,800,63,4DFF,4DFF,2,3F00,7D0,0,20,100,200,200,400,300,258,32,1ca8,C8,2D55,100,FFFF,0,FF80,FBDB,FCEB,E8,F0B1,3C90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-G9,HBH-DS970,5,4000,4000,0,5092,7FB2,FFFF,2D33,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,0,ED00,0,FFFF,3FD9,0,C80,FF1A,1B0C,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,179f,0,30,800,2000,2000,fa,78,1,190,40,20,3977,40,408A,800,63,4DFF,4DFF,2,3F00,7D0,0,10,100,200,200,400,300,258,32,1ca8,C8,2D55,100,FFFF,0,FF80,FBDB,FCEB,E8,F0B1,3C90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-G10,i.Tech BlueBAND,5,4000,4000,0,7FB2,7FB2,FFFF,2D33,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,0,ED00,0,FFFF,3FD9,0,C80,FF1A,1B0C,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,179f,0,20,800,2000,2000,fa,78,1,190,40,20,3977,40,408A,800,63,4DFF,4DFF,2,3F00,7D0,0,40,100,200,200,400,300,258,32,1ca8,C8,2D55,100,FFFF,0,FF80,FBDB,FCEB,E8,F0B1,3C90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-G11,Nokia BH-800,5,4000,4000,0,7FB2,5A67,FFFF,2D33,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,0,ED00,0,0,3FD9,0,780,FF9A,1B0C,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,179f,0,78,800,2000,2000,fa,C8,1,190,40,20,3977,40,408A,800,63,4DFF,4DFF,2,3F00,BB8,0,60,100,800,400,400,300,258,32,1ca8,300,2D55,100,FFFF,0,FF80,FBDB,FCEB,E8,F0B1,3C90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-G12,Motorola H700,5,4000,4000,0,5A67,5A67,0,3FD9,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,0,ED00,0,0,3FD9,0,F00,FF1A,1D80,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,0,0,20,800,2000,2000,fa,78,1,190,40,20,3977,40,408A,800,63,4DFF,4DFF,2,3F00,BB8,0,40,100,400,200,400,300,258,32,1ca8,C8,2D55,100,FFFF,0,FF21,FD5D,FB9C,FA19,F8A4,3C90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-G13,HTC BH M200,5,4000,4000,0,4000,7FB2,0,3FD9,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,0,ED00,0,0,3FD9,0,F00,FF1A,1D80,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,0,0,20,800,2000,2000,fa,78,1,190,40,20,3977,40,408A,800,63,4DFF,4DFF,2,3F00,BB8,0,40,100,400,200,400,300,258,32,1ca8,C8,2D55,100,FFFF,0,0,0,0,0,0,4000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-G14,Jabra JX10,5,4000,4000,0,5A67,7FB2,FFFF,2D33,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,0,ED00,0,0,3FD9,0,C80,FF1A,1B0C,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,179f,0,60,800,2000,2000,fa,C8,1,190,40,20,3977,40,408A,800,63,4DFF,4DFF,2,3F00,7D0,0,20,100,400,200,400,300,258,32,1ca8,C8,2D55,100,FFFF,0,FF80,FBDB,FCEB,E8,F0B1,3C90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-G15,320Plantronics,5,4000,4000,0,7FB2,7FB2,FFFF,2D33,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,0,ED00,0,0,3FD9,0,C80,FF1A,1B0C,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,179f,0,20,800,2000,2000,fa,C8,1,190,40,20,3977,40,408A,800,63,4DFF,4DFF,2,3F00,7D0,0,20,100,400,200,400,300,258,32,1ca8,C8,2D55,100,FFFF,0,FF80,FBDB,FCEB,E8,F0B1,3C90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-G16,640Plantronics,5,4000,4000,0,7FB2,4000,0,2D33,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,0,ED00,0,0,3FD9,0,C80,FF1A,1B0C,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,179f,0,20,800,2000,2000,fa,C8,1,190,40,20,3977,40,408A,800,63,4DFF,4DFF,2,4000,BB8,0,20,161,400,200,400,300,258,32,1ca8,400,2D55,100,FFFF,0,FF21,FD5D,FB9C,FA19,F8A4,3C90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-G17,Jabra BT500,5,4000,4000,0,7FB2,5A67,0,2D33,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,0,ED00,0,0,3FD9,0,C80,FF1A,1B0C,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,179f,0,20,800,2000,2000,fa,C8,1,190,40,20,3977,40,408A,800,63,4DFF,4DFF,2,4000,BB8,0,40,161,800,200,400,300,258,32,1ca8,C8,2D55,100,FFFF,0,FF80,FBDB,FCEB,E8,F0B1,3C90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-G18,Motorola HT820,5,4000,4000,0,5092,7FB2,0,2D33,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,0,ED00,0,0,3FD9,0,C80,FF1A,1B0C,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,0,0,20,800,2000,2000,fa,C8,1,190,40,20,3977,40,408A,800,63,4DFF,4DFF,2,3F00,7D0,0,40,100,200,200,400,300,258,32,1ca8,C8,2D55,100,FFFF,0,FF10,FCC8,F8A0,F4F2,F04B,65AD,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-G19,HBH-IV840,5,4000,4000,0,7FB2,7FB2,0,2D33,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,0,ED00,0,0,2D33,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,0,0,20,800,2000,2000,fa,78,1,190,40,20,3977,40,408A,800,63,4DFF,4DFF,2,3F00,7D0,0,20,100,200,200,400,300,258,64,1ca8,C8,2D55,100,FFFF,0,FF80,FBDB,FCEB,E8,F0B1,3C90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-G20,6XXPlantronics,5,4000,4000,0,7FB2,A0C2,0,2D33,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,0,ED00,0,0,3FD9,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,179f,0,20,800,2000,2000,fa,C8,1,190,40,20,3977,40,408A,800,63,4DFF,4DFF,2,3F00,7D0,0,0,0,0,0,400,300,258,64,1ca8,C8,2D55,100,FFFF,0,FF80,FBDB,FCEB,E8,F0B1,3C90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-G21,3xxPlantronics,5,4000,4000,0,5A67,4000,FFFF,2D33,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,0,ED00,0,FFFF,3FD9,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,179f,0,80,800,1500,2000,fa,78,1,190,40,20,3977,40,408A,800,63,4DFF,4DFF,2,3F00,BB8,0,20,100,100,200,400,300,258,64,1ca8,C8,2D55,100,FFFF,0,FF80,FBDB,FCEB,E8,F0B1,3C90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-G22,HBH-PV710,5,4000,4000,0,71CF,4000,FFFF,2D33,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,0,ED00,0,FFFF,2D33,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,179f,0,80,800,2000,2000,fa,78,1,190,40,20,3977,40,408A,800,63,4DFF,4DFF,2,3F00,7D0,0,20,100,200,200,400,300,258,64,1ca8,C8,2D55,100,FFFF,0,FF80,FBDB,FCEB,E8,F0B1,3C90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-G23,Motorola H670,5,4000,4000,0,7FB2,7FB2,FFFF,2D33,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,0,ED00,0,FFFF,3FD9,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,179f,0,80,800,2000,2000,fa,78,1,190,40,20,3977,40,408A,800,63,4DFF,4DFF,2,3F00,7D0,0,20,100,100,200,400,300,258,64,1ca8,C8,2D55,100,FFFF,0,FF80,FBDB,FCEB,E8,F0B1,3C90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-G24,HBM-300,5,4000,4000,0,7FB2,7FB2,FFFF,2D33,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,0,ED00,0,FFFF,2D33,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,179f,0,70,800,2000,2000,fa,78,1,190,40,20,3977,40,408A,800,63,4DFF,4DFF,2,3F00,7D0,0,20,100,200,200,400,300,258,64,1ca8,C8,2D55,100,FFFF,0,FF80,FBDB,FCEB,E8,F0B1,3C90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-G25,Nokia BH-208,5,4000,4000,0,5A67,7FB2,FFFF,2000,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,0,ED00,0,FFFF,2D33,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,179f,0,70,800,2000,2000,fa,C8,1,190,40,20,3977,40,408A,800,63,4DFF,4DFF,2,3F00,7D0,0,20,100,200,200,400,300,258,64,1ca8,C8,2D55,100,FFFF,0,FF80,FBDB,FCEB,E8,F0B1,3C90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-G26,Samsung WEP410,5,4000,4000,0,7FB2,2D4E,FFFF,2000,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,0,ED00,0,FFFF,2D33,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,179f,0,20,800,2000,2000,fa,78,1,190,40,20,3977,40,408A,800,63,4DFF,4DFF,2,3F00,7D0,0,0,100,200,150,400,300,258,64,1ca8,C8,2D55,100,FFFF,0,FF80,FBDB,FCEB,E8,F0B1,3C90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-G27,Jabra BT8010,5,4000,4000,0,7FB2,71CF,0,2D33,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,0,ED00,0,0,3FD9,0,C80,FF1A,1B0C,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,0,0,30,800,2000,2000,fa,78,1,190,40,20,3977,40,408A,800,63,4DFF,4DFF,2,3F00,7D0,0,10,100,200,200,400,300,258,64,1ca8,C8,2D55,100,FFFF,0,FF80,FBDB,FCEB,E8,F0B1,3C90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-G28,Motorola S9,5,4000,4000,0,7FB2,4000,0,3FD9,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,0,ED00,0,0,3FD9,0,F00,FF1A,1D80,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,0,0,20,800,2000,2000,fa,78,1,190,40,20,3977,40,408A,800,63,4DFF,4DFF,2,3F00,BB8,0,40,100,400,200,400,300,258,64,1ca8,C8,2D55,100,FFFF,0,FF21,FD5D,FB9C,FA19,F8A4,3C90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-G29,Jabra BT620s,5,4000,4000,0,5A67,7FB2,FFFF,2D33,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,0,ED00,0,0,3FD9,0,C80,FF1A,1B0C,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,179f,0,270,800,2000,2000,fa,C8,1,190,40,20,3977,40,408A,800,63,4DFF,4DFF,2,4000,BB8,0,40,100,200,200,400,300,258,64,1ca8,C8,2D55,100,FFFF,0,FF80,FBDB,FCEB,E8,F0B1,3C90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-G30,Nokia BH-902,5,4000,4000,0,71CF,7FB2,FFFF,2D33,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,0,ED00,0,FFFF,2D33,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,0,0,70,800,2000,2000,fa,C8,1,190,40,20,3977,40,408A,800,63,4DFF,4DFF,2,3F00,7D0,0,20,100,200,200,400,300,258,64,1ca8,C8,2D55,100,FFFF,0,FF80,FBDB,FCEB,E8,F0B1,3C90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-G31,HBH-DS220,5,4000,4000,0,4000,B45F,FFFF,2D33,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,0,ED00,0,0,2D33,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,0,0,20,800,2000,2000,fa,78,1,190,40,20,3977,40,408A,800,63,4DFF,4DFF,2,3F00,7D0,0,20,100,200,200,400,300,258,64,1ca8,C8,2D55,100,FFFF,0,FF80,FBDB,FCEB,E8,F0B1,3C90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-G32,HBH-DS980,5,4000,4000,0,5092,7FB2,FFFF,2D33,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,0,ED00,0,FFFF,2D33,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,179f,0,30,800,2000,2000,fa,78,1,190,40,20,3977,40,408A,800,63,4DFF,4DFF,2,3F00,7D0,0,10,100,200,200,400,300,258,32,1ca8,C8,2D55,100,FFFF,0,FF80,FBDB,FCEB,E8,F0B1,3C90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-G33,BT_EC_OFF,5,4000,4000,0,7FB2,7FB2,0,2D33,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,0,ED00,0,0,3FD9,0,C80,FF1A,1B0C,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,0,0,20,800,2000,2000,fa,C8,1,190,40,20,3977,40,408A,800,63,4DFF,4DFF,2,5208,1F40,0,106,161,800,200,1912,300,258,32,1ca8,C8,2D55,100,FFFF,0,0,0,0,0,0,4000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-G34,Motorola H721,5,4000,4000,0,71CF,2D4E,0,2D33,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,0,ED00,0,0,3FD9,0,C80,FF1A,1B0C,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,179f,0,200,800,2000,2000,fa,46,1,190,40,20,3977,40,408A,800,63,4DFF,4DFF,2,3F00,1200,0,20,100,200,200,400,300,258,32,1ca8,1000,2D55,100,FFFF,0,FF21,FD5D,FB9C,FA19,F8A4,3C90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
diff --git a/prebuilt/dream_sapphire/etc/AudioPara_sapphire.csv b/prebuilt/dream_sapphire/etc/AudioPara_sapphire.csv
deleted file mode 100644
index dde1adb..0000000
--- a/prebuilt/dream_sapphire/etc/AudioPara_sapphire.csv
+++ /dev/null
@@ -1,162 +0,0 @@
-Header,Sapphire_VODAFONE_20090305
-A0,HTC_VOC_CODEC_EARCUPLE_VOICE,35,71,36,61,37,0,38,0,39,3,3A,0,3B,0,3C,0,3D,0,3E,0,3F,0,40,0,41,1C,42,0,43,0,44,0,45,0,46,0,47,0,48,0,49,0,4A,1,4B,0,4C,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-A1,HTC_VOC_CODEC_EARCUPLE_MIDI,35,71,36,61,37,0,38,0,39,3,3A,0,3B,0,3C,0,3D,0,3E,0,3F,0,40,0,41,1C,42,0,43,0,44,0,45,0,46,0,47,0,48,0,49,0,4A,1,4B,0,4C,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-A2,HTC_VOC_CODEC_SPEAKER_VOICE,35,63,36,63,37,0,38,0,39,3,3A,0,3B,0,3C,0,3D,0,3E,0,3F,0,40,0,41,0,42,0,43,0,44,0,45,0,46,0,47,0,48,0,49,0,4A,18,4B,0,4C,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-A3,HTC_VOC_CODEC_SPEAKER_MIDI,35,63,36,63,37,0,38,0,39,3,3A,0,3B,0,3C,0,3D,0,3E,0,3F,0,40,0,41,0,42,0,43,0,44,0,45,0,46,0,47,0,48,0,49,0,4A,18,4B,0,4C,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-A4,HTC_VOC_CODEC_HEADSET_VOICE,35,69,36,69,37,0,38,0,39,3,3A,80,3B,0,3C,0,3D,0,3E,0,3F,0,40,0,41,1C,42,0,43,0,44,0,45,0,46,0,47,0,48,0,49,0,4A,6,4B,0,4C,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-A5,HTC_VOC_CODEC_HEADSET_MIDI,35,69,36,69,37,0,38,0,39,3,3A,80,3B,0,3C,0,3D,0,3E,0,3F,0,40,0,41,1C,42,0,43,0,44,0,45,0,46,0,47,0,48,0,49,0,4A,6,4B,0,4C,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-A6,HTC_VOC_CODEC_BT_VOICE,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-A7,HTC_VOC_CODEC_BT_MIDI,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-A8,HTC_VOC_CODEC_CARKIT_VOICE,35,69,36,69,37,0,38,0,39,3,3A,80,3B,0,3C,0,3D,0,3E,0,3F,0,40,0,41,1C,42,0,43,0,44,0,45,0,46,0,47,0,48,0,49,0,4A,6,4B,0,4C,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-A9,HTC_VOC_CODEC_CARKIT_MIDI,35,69,36,69,37,0,38,0,39,3,3A,80,3B,0,3C,0,3D,0,3E,0,3F,0,40,0,41,1C,42,0,43,0,44,0,45,0,46,0,47,0,48,0,49,0,4A,6,4B,0,4C,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-A10,HTC_VOC_CODEC_TTY_FULL_VOICE,35,69,36,69,37,0,38,0,39,3,3A,80,3B,0,3C,0,3D,0,3E,0,3F,0,40,0,41,1C,42,0,43,0,44,0,45,0,46,0,47,0,48,0,49,0,4A,6,4B,0,4C,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-A11,HTC_VOC_CODEC_TTY_FULL_MIDI,35,69,36,69,37,0,38,0,39,3,3A,80,3B,0,3C,0,3D,0,3E,0,3F,0,40,0,41,1C,42,0,43,0,44,0,45,0,46,0,47,0,48,0,49,0,4A,6,4B,0,4C,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-A12,HTC_VOC_CODEC_TTY_VCO_VOICE,35,69,36,69,37,0,38,0,39,3,3A,80,3B,0,3C,0,3D,0,3E,0,3F,0,40,0,41,1C,42,0,43,0,44,0,45,0,46,0,47,0,48,0,49,0,4A,6,4B,0,4C,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-A13,HTC_VOC_CODEC_TTY_VCO_MIDI,35,69,36,69,37,0,38,0,39,3,3A,80,3B,0,3C,0,3D,0,3E,0,3F,0,40,0,41,1C,42,0,43,0,44,0,45,0,46,0,47,0,48,0,49,0,4A,6,4B,0,4C,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-A14,HTC_VOC_CODEC_TTY_HCO_VOICE,35,71,36,61,37,0,38,0,39,3,3A,0,3B,0,3C,0,3D,0,3E,0,3F,0,40,0,41,1C,42,0,43,0,44,0,45,0,46,0,47,0,48,0,49,0,4A,1,4B,0,4C,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-A15,HTC_VOC_CODEC_TTY_HCO_MIDI,35,71,36,61,37,0,38,0,39,3,3A,0,3B,0,3C,0,3D,0,3E,0,3F,0,40,0,41,1C,42,0,43,0,44,0,45,0,46,0,47,0,48,0,49,0,4A,1,4B,0,4C,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-A16,HTC_VOC_CODEC_NO_MIC_HEADSET_VOICE,35,69,36,69,37,0,38,0,39,3,3A,80,3B,0,3C,0,3D,0,3E,0,3F,0,40,0,41,1C,42,0,43,0,44,0,45,0,46,0,47,0,48,0,49,0,4A,6,4B,0,4C,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-A17,HTC_VOC_CODEC_NO_MIC_HEADSET_MIDI,35,69,36,69,37,0,38,0,39,3,3A,80,3B,0,3C,0,3D,0,3E,0,3F,0,40,0,41,1C,42,0,43,0,44,0,45,0,46,0,47,0,48,0,49,0,4A,6,4B,0,4C,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-A18,HTC_VOC_CODEC_FMHEADSET_VOICE,35,69,36,69,37,0,38,0,39,3,3A,80,3B,0,3C,0,3D,0,3E,0,3F,0,40,0,41,1C,42,0,43,0,44,0,45,0,46,0,47,0,48,0,49,0,4A,6,4B,0,4C,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-A19,HTC_VOC_CODEC_FMHEADSET_MIDI,35,69,36,69,37,0,38,0,39,3,3A,80,3B,0,3C,0,3D,0,3E,0,3F,0,40,0,41,1C,42,0,43,0,44,0,45,0,46,0,47,0,48,0,49,0,4A,6,4B,0,4C,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-A20,HTC_VOC_CODEC_HEADSET_SPEAKER_VOICE,35,6B,36,6B,37,0,38,0,39,3,3A,80,3B,0,3C,0,3D,0,3E,0,3F,0,40,0,41,10,42,0,43,0,44,0,45,0,46,0,47,0,48,0,49,0,4A,1E,4B,0,4C,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-A21,HTC_VOC_CODEC_HEADSET_SPEAKER_MIDI,35,6B,36,6B,37,0,38,0,39,3,3A,80,3B,0,3C,0,3D,0,3E,0,3F,0,40,0,41,10,42,0,43,0,44,0,45,0,46,0,47,0,48,0,49,0,4A,1E,4B,0,4C,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-A22,HTC_VOC_CODEC_FMSPEAKER_VOICE,35,71,36,61,37,0,38,0,39,3,3A,0,3B,0,3C,0,3D,0,3E,0,3F,0,40,0,41,1C,42,0,43,0,44,0,45,0,46,0,47,0,48,0,49,0,4A,1,4B,0,4C,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-A23,HTC_VOC_CODEC_FMSPEAKER_MIDI,35,71,36,61,37,0,38,0,39,3,3A,0,3B,0,3C,0,3D,0,3E,0,3F,0,40,0,41,1C,42,0,43,0,44,0,45,0,46,0,47,0,48,0,49,0,4A,1,4B,0,4C,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-U0,HTC_VOC_CODEC_EARCUPLE_VOICE,35,0,36,0,37,FF,38,0,39,0,3A,0,3B,0,3C,34,3D,34,3E,0,3F,80,40,5,41,0,42,1,43,0,44,0,45,0,46,0,47,0,48,0,49,0,4A,0,4B,0,4C,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-U1,HTC_VOC_CODEC_EARCUPLE_MIDI,35,0,36,0,37,FF,38,0,39,0,3A,0,3B,0,3C,18,3D,18,3E,0,3F,80,40,5,41,0,42,1,43,0,44,0,45,0,46,0,47,0,48,0,49,0,4A,0,4B,0,4C,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-U2,HTC_VOC_CODEC_SPEAKER_VOICE,35,0,36,0,37,FF,38,0,39,0,3A,0,3B,0,3C,38,3D,38,3E,0,3F,0,40,0,41,0,42,1,43,0,44,0,45,0,46,0,47,0,48,0,49,0,4A,0,4B,0,4C,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-U3,HTC_VOC_CODEC_SPEAKER_MIDI,35,0,36,0,37,FF,38,0,39,0,3A,0,3B,0,3C,34,3D,34,3E,0,3F,0,40,0,41,0,42,1,43,0,44,0,45,0,46,0,47,0,48,0,49,0,4A,0,4B,0,4C,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-U4,HTC_VOC_CODEC_HEADSET_VOICE,35,0,36,0,37,FF,38,0,39,0,3A,0,3B,0,3C,28,3D,28,3E,8,3F,80,40,5,41,0,42,1,43,0,44,0,45,0,46,0,47,0,48,0,49,0,4A,0,4B,0,4C,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-U5,HTC_VOC_CODEC_HEADSET_MIDI,35,0,36,0,37,FF,38,0,39,0,3A,0,3B,0,3C,3C,3D,3C,3E,8,3F,80,40,5,41,0,42,1,43,0,44,0,45,0,46,0,47,0,48,0,49,0,4A,0,4B,0,4C,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-U6,HTC_VOC_CODEC_BT_VOICE,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-U7,HTC_VOC_CODEC_BT_MIDI,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-U8,HTC_VOC_CODEC_CARKIT_VOICE,35,0,36,0,37,FF,38,0,39,0,3A,0,3B,0,3C,28,3D,28,3E,8,3F,80,40,5,41,0,42,0,43,0,44,0,45,0,46,0,47,0,48,0,49,0,4A,0,4B,0,4C,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-U9,HTC_VOC_CODEC_CARKIT_MIDI,35,0,36,0,37,FF,38,0,39,0,3A,0,3B,0,3C,20,3D,20,3E,8,3F,80,40,5,41,0,42,0,43,0,44,0,45,0,46,0,47,0,48,0,49,0,4A,0,4B,0,4C,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-U10,HTC_VOC_CODEC_TTY_FULL_VOICE,35,0,36,0,37,FF,38,0,39,0,3A,0,3B,0,3C,3C,3D,3C,3E,8,3F,80,40,5,41,0,42,0,43,0,44,0,45,0,46,0,47,0,48,0,49,0,4A,0,4B,0,4C,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-U11,HTC_VOC_CODEC_TTY_FULL_MIDI,35,0,36,0,37,FF,38,0,39,0,3A,0,3B,0,3C,3C,3D,3C,3E,8,3F,80,40,5,41,0,42,0,43,0,44,0,45,0,46,0,47,0,48,0,49,0,4A,0,4B,0,4C,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-U12,HTC_VOC_CODEC_TTY_VCO_VOICE,35,0,36,0,37,FF,38,0,39,0,3A,0,3B,0,3C,44,3D,44,3E,0,3F,80,40,5,41,0,42,0,43,0,44,0,45,0,46,0,47,0,48,0,49,0,4A,0,4B,0,4C,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-U13,HTC_VOC_CODEC_TTY_VCO_MIDI,35,0,36,0,37,FF,38,0,39,0,3A,0,3B,0,3C,44,3D,44,3E,0,3F,80,40,5,41,0,42,0,43,0,44,0,45,0,46,0,47,0,48,0,49,0,4A,0,4B,0,4C,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-U14,HTC_VOC_CODEC_TTY_HCO_VOICE,35,0,36,0,37,FF,38,0,39,0,3A,0,3B,0,3C,A0,3D,A0,3E,8,3F,80,40,5,41,0,42,0,43,0,44,0,45,0,46,0,47,0,48,0,49,0,4A,0,4B,0,4C,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-U15,HTC_VOC_CODEC_TTY_HCO_MIDI,35,0,36,0,37,FF,38,0,39,0,3A,0,3B,0,3C,A0,3D,A0,3E,8,3F,80,40,5,41,0,42,0,43,0,44,0,45,0,46,0,47,0,48,0,49,0,4A,0,4B,0,4C,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-U16,HTC_VOC_CODEC_NO_MIC_HEADSET_VOICE,35,0,36,0,37,FF,38,0,39,0,3A,0,3B,0,3C,28,3D,28,3E,8,3F,80,40,5,41,0,42,1,43,0,44,0,45,0,46,0,47,0,48,0,49,0,4A,0,4B,0,4C,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-U17,HTC_VOC_CODEC_NO_MIC_HEADSET_MIDI,35,0,36,0,37,FF,38,0,39,0,3A,0,3B,0,3C,20,3D,20,3E,8,3F,80,40,5,41,0,42,1,43,0,44,0,45,0,46,0,47,0,48,0,49,0,4A,0,4B,0,4C,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-U18,HTC_VOC_CODEC_FMHEADSET_VOICE,35,0,36,0,37,FF,38,0,39,0,3A,0,3B,0,3C,A0,3D,A0,3E,8,3F,80,40,5,41,0,42,0,43,0,44,0,45,0,46,0,47,0,48,0,49,0,4A,0,4B,0,4C,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-U19,HTC_VOC_CODEC_FMHEADSET_MIDI,35,0,36,0,37,FF,38,0,39,0,3A,0,3B,0,3C,A0,3D,A0,3E,8,3F,80,40,5,41,0,42,0,43,0,44,0,45,0,46,0,47,0,48,0,49,0,4A,0,4B,0,4C,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-U20,HTC_VOC_CODEC_HEADSET_SPEAKER_VOICE,35,0,36,0,37,FF,38,0,39,0,3A,0,3B,0,3C,44,3D,44,3E,0,3F,80,40,5,41,0,42,1,43,0,44,0,45,0,46,0,47,0,48,0,49,0,4A,0,4B,0,4C,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-U21,HTC_VOC_CODEC_HEADSET_SPEAKER_MIDI,35,0,36,0,37,FF,38,0,39,0,3A,0,3B,0,3C,44,3D,44,3E,0,3F,80,40,5,41,0,42,1,43,0,44,0,45,0,46,0,47,0,48,0,49,0,4A,0,4B,0,4C,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-U22,HTC_VOC_CODEC_FMSPEAKER_VOICE,35,0,36,0,37,FF,38,0,39,0,3A,0,3B,0,3C,C4,3D,C4,3E,8,3F,80,40,5,41,0,42,0,43,0,44,0,45,0,46,0,47,0,48,0,49,0,4A,0,4B,0,4C,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-U23,HTC_VOC_CODEC_FMSPEAKER_MIDI,35,0,36,0,37,FF,38,0,39,0,3A,0,3B,0,3C,C4,3D,C4,3E,8,3F,80,40,5,41,0,42,0,43,0,44,0,45,0,46,0,47,0,48,0,49,0,4A,0,4B,0,4C,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-D0,HTC_VOC_CODEC_EARCUPLE_VOICE,1,2,22,0,818,0,0,0,0,0
-D1,HTC_VOC_CODEC_EARCUPLE_MIDI,1,6,22,0,818,0,0,0,0,0
-D2,HTC_VOC_CODEC_SPEAKER_VOICE,1,2,22,0,818,0,0,0,0,0
-D3,HTC_VOC_CODEC_SPEAKER_MIDI,1,6,22,0,818,0,0,0,0,0
-D4,HTC_VOC_CODEC_HEADSET_VOICE,1,3,22,0,818,0,0,c,0,0
-D5,HTC_VOC_CODEC_HEADSET_MIDI,1,6,22,0,818,0,0,c,0,0
-D6,HTC_VOC_CODEC_BT_VOICE,4002,0,22,3,800,0,1,0,0,0
-D7,HTC_VOC_CODEC_BT_MIDI,4002,0,22,3,800,0,1,0,0,0
-D8,HTC_VOC_CODEC_CARKIT_VOICE,1,7,22,0,818,0,0,0,0,0
-D9,HTC_VOC_CODEC_CARKIT_MIDI,1,7,22,0,818,0,0,0,0,0
-D10,HTC_VOC_CODEC_TTY_FULL_VOICE,1,7,22,0,818,0,0,0,0,0
-D11,HTC_VOC_CODEC_TTY_FULL_MIDI,1,7,22,0,818,0,0,0,0,0
-D12,HTC_VOC_CODEC_TTY_VCO_VOICE,1,7,22,0,818,0,0,0,0,0
-D13,HTC_VOC_CODEC_TTY_VCO_MIDI,1,7,22,0,818,0,0,0,0,0
-D14,HTC_VOC_CODEC_TTY_HCO_VOICE,1,7,22,0,818,0,0,0,0,0
-D15,HTC_VOC_CODEC_TTY_HCO_MIDI,1,7,22,0,818,0,0,0,0,0
-D16,HTC_VOC_CODEC_NO_MIC_HEADSET_VOICE,1,3,22,0,818,0,0,c,0,0
-D17,HTC_VOC_CODEC_NO_MIC_HEADSET_MIDI,1,6,22,0,818,0,0,c,0,0
-D18,HTC_VOC_CODEC_FMHEADSET_VOICE,1,7,22,0,818,0,0,0,0,0
-D19,HTC_VOC_CODEC_FMHEADSET_MIDI,1,7,22,0,818,0,0,0,0,0
-D20,HTC_VOC_CODEC_HEADSET_SPEAKER_VOICE,1,7,22,0,818,0,0,0,0,0
-D21,HTC_VOC_CODEC_HEADSET_SPEAKER_MIDI,1,7,22,0,818,0,0,0,0,0
-D22,HTC_VOC_CODEC_FMSPEAKER_VOICE,1,7,22,0,818,0,0,0,0,0
-D23,HTC_VOC_CODEC_FMSPEAKER_MIDI,1,7,22,0,818,0,0,0,0,0
-F0,PHONE_HEADSET_VOL0,0,4000,2013,0,7FB2,2013,FFFF,2D33,0,C80,FF9A,1D80,F333,01EC,FFEE,200A,7F65,0,ED00,0,0,3FD9,0,C80,FF9A,1B0C,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,149f,0,14,800,2000,2000,fa,46,2,2ff,40,20,4650,40,41a0,800,63,4DFF,4DFF,2,3F00,7D0,0,0,100,100,200,100,300,150,64,1ca8,1c2,2ee0,fa0,FFFF,0,FF68,FB13,FC56,114,EDCE,47FB,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-F1,PHONE_HEADSET_VOL1,1,4000,2861,0,7FB2,2861,FFFF,2D33,0,C80,FF9A,1D80,F333,01EC,FFEE,200A,7F65,0,ED00,0,0,3FD9,0,C80,FF9A,1B0C,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,149f,0,14,800,2000,2000,fa,46,2,2ff,40,20,4650,40,41a0,800,63,4DFF,4DFF,2,3F00,7D0,0,0,100,100,200,100,300,150,64,1ca8,1c2,2ee0,fa0,FFFF,0,FF68,FB13,FC56,114,EDCE,47FB,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-F2,PHONE_HEADSET_VOL2,2,4000,32D6,0,7FB2,32D6,FFFF,2D33,0,C80,FF9A,1D80,F333,01EC,FFEE,200A,7F65,0,ED00,0,0,3FD9,0,C80,FF9A,1B0C,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,149f,0,14,800,2000,2000,fa,46,2,2ff,40,20,4650,40,41a0,800,63,4DFF,4DFF,2,3F00,7D0,0,0,100,100,200,100,300,150,64,1ca8,1c2,2ee0,fa0,FFFF,0,FF68,FB13,FC56,114,EDCE,47FB,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-F3,PHONE_HEADSET_VOL3,3,4000,4000,0,7FB2,4000,FFFF,2D33,0,C80,FF9A,1D80,F333,01EC,FFEE,200A,7F65,0,ED00,0,0,3FD9,0,C80,FF9A,1B0C,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,149f,0,14,800,2000,2000,fa,46,2,2ff,40,20,4650,40,41a0,800,63,4DFF,4DFF,2,3F00,7D0,0,0,100,100,200,100,300,150,64,1ca8,1c2,2ee0,fa0,FFFF,0,FF68,FB13,FC56,114,EDCE,47FB,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-F4,PHONE_HEADSET_VOL4,4,4000,4000,0,7FB2,656E,FFFF,2D33,0,C80,FF9A,1D80,F333,01EC,FFEE,200A,7F65,0,ED00,0,0,3FD9,0,C80,FF9A,1B0C,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,149f,0,14,800,2000,2000,fa,46,2,2ff,40,20,4650,40,41a0,800,63,4DFF,4DFF,2,3F00,7D0,0,0,100,100,200,100,300,200,64,1ca8,1c2,2ee0,fa0,FFFF,0,FF68,FB13,FC56,114,EDCE,47FB,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-F5,PHONE_HEADSET_VOL5,5,4000,4000,0,7FB2,A0C2,FFFF,2D33,0,C80,FF9A,1D80,F333,01EC,FFEE,200A,7F65,0,ED00,0,0,3FD9,0,C80,FF9A,1B0C,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,149f,0,14,800,2000,2000,fa,46,2,2ff,40,20,4650,40,41a0,800,63,4DFF,4DFF,2,3F00,7D0,0,0,100,100,200,100,300,258,64,1ca8,1c2,2ee0,fa0,FFFF,0,FF68,FB13,FC56,114,EDCE,47FB,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-F6,PHONE_HANDSFREE_VOL0,0,4000,143D,0,7FB2,5A67,FFFF,3FD9,0,C80,FF9A,2050,F333,01EC,FFEE,200A,7F65,0,ED00,0,FFFF,3FD9,0,1180,FF9A,1D80,F333,01EC,FFEE,200A,7F65,6000,800,7fff,179f,0,14,2000,2000,2000,80,8c,2,190,40,20,4650,40,41a0,800,63,4DFF,4DFF,2,3600,7D0,0,50,100,100,200,200,300,200,64,1ca8,300,800,fa0,FFFF,0,FF5D,FD56,F9DB,F864,FC17,3C90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-F7,PHONE_HANDSFREE_VOL1,1,4000,143D,0,7FB2,7FB2,FFFF,3FD9,0,C80,FF9A,2050,F333,01EC,FFEE,200A,7F65,0,ED00,0,FFFF,3FD9,0,1180,FF9A,1D80,F333,01EC,FFEE,200A,7F65,6000,800,7fff,179f,0,14,2000,2000,2000,80,8c,2,190,40,20,4650,40,41a0,800,63,4DFF,4DFF,2,3600,7D0,0,50,100,100,200,200,300,200,64,1ca8,300,800,fa0,FFFF,0,FF5D,FD56,F9DB,F864,FC17,3C90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-F8,PHONE_HANDSFREE_VOL2,2,4000,143D,0,7FB2,B45F,FFFF,3FD9,0,C80,FF9A,2050,F333,01EC,FFEE,200A,7F65,0,ED00,0,FFFF,3FD9,0,1180,FF9A,1D80,F333,01EC,FFEE,200A,7F65,6000,800,7fff,179f,0,14,2000,2000,2000,80,8c,2,190,40,20,4650,40,41a0,800,63,4DFF,4DFF,2,3600,7D0,0,50,100,100,200,200,300,200,64,1ca8,300,800,fa0,FFFF,0,FF5D,FD56,F9DB,F864,FC17,3C90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-F9,PHONE_HANDSFREE_VOL3,3,4000,1C96,0,7FB2,B45F,FFFF,3FD9,0,C80,FF9A,2050,F333,01EC,FFEE,200A,7F65,0,ED00,0,FFFF,3FD9,0,1180,FF9A,1D80,F333,01EC,FFEE,200A,7F65,6000,800,7fff,179f,0,14,2000,2000,2000,80,8c,2,190,40,20,4650,40,41a0,800,63,4DFF,4DFF,2,3600,7D0,0,100,100,100,200,100,300,200,64,1ca8,300,800,fa0,FFFF,0,FF5D,FD56,F9DB,F864,FC17,3C90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-F10,PHONE_HANDSFREE_VOL4,4,4000,2D4E,0,7FB2,B45F,FFFF,3FD9,0,C80,FF9A,2050,F333,01EC,FFEE,200A,7F65,0,ED00,0,FFFF,3FD9,0,1180,FF9A,1D80,F333,01EC,FFEE,200A,7F65,32F4,800,7fff,179f,0,14,2000,2000,2000,80,8c,2,190,40,20,4650,40,41a0,800,63,4DFF,4DFF,2,3F00,7D0,0,100,100,100,400,200,300,200,64,1ca8,800,800,fa0,FFFF,0,FF5D,FD56,F9DB,F864,FC17,3C90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-F11,PHONE_HANDSFREE_VOL5,5,4000,4000,0,7FB2,B45F,FFFF,3FD9,0,C80,FF9A,2050,F333,01EC,FFEE,200A,7F65,0,ED00,0,FFFF,3FD9,0,1180,FF9A,1D80,F333,01EC,FFEE,200A,7F65,32F4,800,7fff,179f,0,14,2000,2000,2000,80,8c,2,190,40,20,4650,40,41a0,800,63,4DFF,4DFF,2,3F00,7D0,0,100,100,100,400,200,300,200,64,1ca8,900,800,fa0,FFFF,0,FF5D,FD56,F9DB,F864,FC17,3C90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-F12,PHONE_EARCUPLE_VOL0,0,4000,4000,0,7FB2,1013,FFFF,2D33,0,780,FF9A,1F00,F333,01EC,FFEE,200A,7F65,0,ED00,0,FFFF,2000,0,780,FF9A,1B0C,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,149f,0,14,1000,1500,2000,fa,46,2,2ff,40,20,4650,40,41a0,800,63,4DFF,4DFF,2,3F00,7D0,0,0,100,200,200,50,300,150,64,1ca8,1c2,2ee0,fa0,FFFF,0,FF80,FBDB,FCEB,E8,F0B1,3C90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-F13,PHONE_EARCUPLE_VOL1,1,4000,4000,0,7FB2,16B5,FFFF,2D33,0,780,FF9A,1F00,F333,01EC,FFEE,200A,7F65,0,ED00,0,FFFF,2000,0,780,FF9A,1B0C,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,149f,0,14,1000,1500,2000,fa,46,2,2ff,40,20,4650,40,41a0,800,63,4DFF,4DFF,2,3F00,7D0,0,0,100,200,200,50,300,150,64,1ca8,1c2,2ee0,fa0,FFFF,0,FF80,FBDB,FCEB,E8,F0B1,3C90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-F14,PHONE_EARCUPLE_VOL2,2,4000,4000,0,7FB2,2013,FFFF,2D33,0,780,FF9A,1F00,F333,01EC,FFEE,200A,7F65,0,ED00,0,FFFF,2000,0,780,FF9A,1B0C,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,149f,0,14,1000,1500,2000,fa,46,2,2ff,40,20,4650,40,41a0,800,63,4DFF,4DFF,2,3F00,7D0,0,0,100,200,200,50,300,150,64,1ca8,1c2,2ee0,fa0,FFFF,0,FF80,FBDB,FCEB,E8,F0B1,3C90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-F15,PHONE_EARCUPLE_VOL3,3,4000,4000,0,7FB2,2D4E,FFFF,2D33,0,780,FF9A,1F00,F333,01EC,FFEE,200A,7F65,0,ED00,0,FFFF,2000,0,780,FF9A,1B0C,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,149f,0,14,1000,1500,2000,fa,46,2,2ff,40,20,4650,40,41a0,800,63,4DFF,4DFF,2,3F00,7D0,0,0,100,200,200,50,300,100,64,1ca8,1c2,2ee0,fa0,FFFF,0,FF80,FBDB,FCEB,E8,F0B1,3C90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-F16,PHONE_EARCUPLE_VOL4,4,4000,4000,0,7FB2,4000,FFFF,2D33,0,780,FF9A,1F00,F333,01EC,FFEE,200A,7F65,0,ED00,0,FFFF,2000,0,780,FF9A,1B0C,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,149f,0,14,1000,1500,2000,fa,46,2,2ff,40,20,4650,40,41a0,800,63,4DFF,4DFF,2,3F00,7D0,0,0,100,200,200,50,300,200,64,1ca8,1c2,2ee0,fa0,FFFF,0,FF80,FBDB,FCEB,E8,F0B1,3C90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-F17,PHONE_EARCUPLE_VOL5,5,4000,4000,0,7FB2,5A67,FFFF,2D33,0,780,FF9A,1F00,F333,01EC,FFEE,200A,7F65,0,ED00,0,FFFF,2000,0,780,FF9A,1B0C,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,149f,0,14,1000,1500,2000,fa,46,2,2ff,40,20,4650,40,41a0,800,63,4DFF,4DFF,2,3F00,7D0,0,0,100,200,200,50,300,200,64,1ca8,1c2,2ee0,fa0,FFFF,0,FF80,FBDB,FCEB,E8,F0B1,3C90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-F18,PHONE_BTHEADSET,5,4000,4000,0,7FB2,7FB2,0,2D33,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,0,ED00,0,0,3FD9,0,C80,FF1A,1B0C,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,179f,0,20,800,2000,2000,fa,C8,1,190,40,20,3977,40,408A,800,63,4DFF,4DFF,2,5208,1F40,0,106,161,800,200,1912,300,258,32,1ca8,C8,2D55,100,FFFF,0,FF80,FBDB,FCEB,E8,F0B1,3C90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-F19,PHONE_CARKIT,5,4000,4000,0,7FB2,5A67,0,7F65,0,780,FF9A,1B0C,F333,01EC,FFEE,200A,7F65,0,ED00,0,0,7F65,0,780,FF9A,1B0C,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,149f,0,14,800,2000,2000,fa,46,1,2ff,40,20,4650,40,41a0,800,63,4DFF,4DFF,1,4a38,1770,0,100,100,400,200,400,300,258,190,1ca8,1c2,2ee0,fa0,FFFF,417,FC95,60,EC7D,01D8,F16B,3D23,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-F20,PHONE_TTY_FULL,0,4000,4000,0,4000,4000,0,7F65,0,780,FF9A,1B0C,F333,01EC,FFEE,200A,7F65,0,ED00,0,0,7F65,0,780,FF9A,1B0C,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,0,0,14,800,2000,2000,fa,46,1,2ff,40,20,4650,40,41a0,800,63,4DFF,4DFF,1,4a38,1770,0,100,100,400,200,400,300,258,190,1ca8,1c2,2ee0,fa0,FFFF,4000,0,0,0,0,0,0,FFFF,91,316,400,FF03,17BF,3C90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-F21,PHONE_TTY_VCO,0,4000,2600,0,4000,4000,0,7F65,0,780,FF9A,1B0C,F333,01EC,FFEE,200A,7F65,0,ED00,0,0,7F65,0,780,FF9A,1B0C,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,0,0,14,800,2000,2000,fa,46,1,2ff,40,20,4650,40,41a0,800,63,4DFF,4DFF,1,4a38,1770,0,100,100,400,200,400,300,258,190,1ca8,1c2,2ee0,fa0,FFFF,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-F22,PHONE_TTY_HCO,0,4000,4000,0,4000,5A67,0,7F65,0,780,FF9A,1B0C,F333,01EC,FFEE,200A,7F65,0,ED00,0,0,7F65,0,780,FF9A,1B0C,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,0,0,14,800,2000,2000,fa,46,1,2ff,40,20,4650,40,41a0,800,63,4DFF,4DFF,1,4a38,1770,0,100,100,400,200,400,300,258,190,1ca8,1c2,2ee0,fa0,FFFF,FB93,FBF6,F2C6,FDCC,93,141F,382A,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-F23,CE_REC_INC_MIC,5,4000,4000,0,4000,4000,0,7F65,0,780,FF9A,1B0C,F333,01EC,FFEE,200A,7F65,0,ED00,0,0,7F65,0,780,FF9A,1B0C,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,0,0,14,800,2000,2000,fa,46,1,2ff,40,20,4650,40,41a0,800,63,4DFF,4DFF,1,4a38,1770,0,100,100,400,200,400,300,258,190,1ca8,1c2,2ee0,fa0,FFFF,0,0,0,0,0,0,0,FFFF,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-F24,CE_REC_EXT_MIC,5,4000,4000,0,4000,4000,0,7F65,0,780,FF9A,1B0C,F333,01EC,FFEE,200A,7F65,0,ED00,0,0,7F65,0,780,FF9A,1B0C,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,0,0,14,800,2000,2000,fa,46,1,2ff,40,20,4650,40,41a0,800,63,4DFF,4DFF,1,4a38,1770,0,100,100,400,200,400,300,258,190,1ca8,1c2,2ee0,fa0,FFFF,0,0,0,0,0,0,0,FFFF,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-F25,CE_PLAYBACK_HEADSET,5,4000,30BF,0,4000,4000,0,7F65,0,780,FF9A,1B0C,F333,01EC,FFEE,200A,7F65,0,ED00,0,0,7F65,0,780,FF9A,1B0C,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,0,0,14,800,2000,2000,fa,46,1,2ff,40,20,4650,40,41a0,800,63,4DFF,4DFF,1,4a38,1770,0,100,100,400,200,400,300,258,190,1ca8,1c2,2ee0,fa0,FFFF,0,0,0,0,0,0,0,FFFF,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-F26,CE_PLAYBACK_HANDSFREE,5,4000,5500,0,47CF,47CF,FFFF,2D33,0,780,FF9A,1D80,F333,01EC,FFEE,200A,7F65,0,ED00,0,0,2D33,0,780,FF9A,1B0C,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,149f,0,14,1000,1500,2000,fa,46,2,2ff,40,20,4650,40,41a0,800,63,4DFF,4DFF,2,3F00,7D0,0,0,100,200,200,50,300,200,64,1388,1c2,2ee0,fa0,FFFF,0,197,FE36,711,FEEB,FFD5,3C90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-F27,CE_SYS,5,4000,4000,0,4000,4000,0,7F65,0,780,FF9A,1B0C,F333,01EC,FFEE,200A,7F65,0,ED00,0,0,7F65,0,780,FF9A,1B0C,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,149f,0,14,800,2000,2000,00fa,46,1,2ff,40,20,4650,40,41a0,800,63,4DFF,4DFF,1,4a38,1770,0,100,100,400,200,400,300,258,190,1ca8,1c2,2ee0,fa0,FFFF,0,0,0,0,0,0,0,FFFF,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-F28,VT_HANDSFREE_VOL0,0,4000,143D,0,2013,7FB2,FFFF,3FD9,0,C80,FF9A,2050,F333,01EC,FFEE,200A,7F65,0,ED00,0,FFFF,3FD9,0,1180,FF9A,1D80,F333,01EC,FFEE,200A,7F65,6000,800,7fff,179f,0,14,2000,2000,2000,80,8c,2,190,40,20,4650,40,41a0,800,63,4DFF,4DFF,2,3600,7D0,0,50,100,200,200,200,300,200,64,1ca8,300,800,fa0,FFFF,0,0,0,0,0,0,5000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-F29,VT_HANDSFREE_VOL1,1,4000,143D,0,2013,B45F,FFFF,3FD9,0,C80,FF9A,2050,F333,01EC,FFEE,200A,7F65,0,ED00,0,FFFF,3FD9,0,1180,FF9A,1D80,F333,01EC,FFEE,200A,7F65,6000,800,7fff,179f,0,14,2000,2000,2000,80,8c,2,190,40,20,4650,40,41a0,800,63,4DFF,4DFF,2,3600,7D0,0,50,100,200,200,200,300,200,64,1ca8,300,800,fa0,FFFF,0,0,0,0,0,0,5000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-F30,VT_HANDSFREE_VOL2,2,4000,143D,0,2013,FEC9,FFFF,3FD9,0,C80,FF9A,2050,F333,01EC,FFEE,200A,7F65,0,ED00,0,FFFF,3FD9,0,1180,FF9A,1D80,F333,01EC,FFEE,200A,7F65,6000,800,7fff,179f,0,14,2000,2000,2000,80,8c,2,190,40,20,4650,40,41a0,800,63,4DFF,4DFF,2,3600,7D0,0,50,100,200,200,200,300,200,64,1ca8,300,800,fa0,FFFF,0,0,0,0,0,0,5000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-F31,VT_HANDSFREE_VOL3,3,4000,1C96,0,2013,FEC9,FFFF,3FD9,0,C80,FF9A,2050,F333,01EC,FFEE,200A,7F65,0,ED00,0,FFFF,3FD9,0,1180,FF9A,1D80,F333,01EC,FFEE,200A,7F65,6000,800,7fff,179f,0,14,2000,2000,2000,80,8c,2,190,40,20,4650,40,41a0,800,63,4DFF,4DFF,2,3F00,7D0,0,50,100,100,200,100,300,200,64,1ca8,300,800,fa0,FFFF,0,0,0,0,0,0,5000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-F32,VT_HANDSFREE_VOL4,4,4000,2D4E,0,2013,FEC9,FFFF,3FD9,0,C80,FF9A,2050,F333,01EC,FFEE,200A,7F65,0,ED00,0,FFFF,3FD9,0,1180,FF9A,1D80,F333,01EC,FFEE,200A,7F65,32F4,800,7fff,179f,0,14,2000,2000,2000,80,8c,2,190,40,20,4650,40,41a0,800,63,4DFF,4DFF,2,3F00,bb8,0,100,100,200,400,200,300,200,64,1ca8,300,800,fa0,FFFF,0,0,0,0,0,0,5000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-F33,VT_HANDSFREE_VOL5,5,4000,4000,0,2013,FEC9,FFFF,3FD9,0,C80,FF9A,2050,F333,01EC,FFEE,200A,7F65,0,ED00,0,FFFF,3FD9,0,1180,FF9A,1D80,F333,01EC,FFEE,5A67,7F65,32F4,800,7fff,179f,0,14,2000,2000,2000,80,8c,2,190,40,20,4650,40,41a0,800,63,4DFF,4DFF,2,4A38,bb8,0,100,100,400,500,200,300,200,64,1ca8,300,800,fa0,FFFF,0,0,0,0,0,0,5000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-F34,CE_PLAYBACK_HEADSET_RING,5,4000,4000,0,4000,4000,0,7F65,0,780,FF9A,1B0C,F333,01EC,FFEE,200A,7F65,0,ED00,0,0,7F65,0,780,FF9A,1B0C,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,149f,0,14,800,2000,2000,00fa,46,1,2ff,40,20,4650,40,41a0,800,63,4DFF,4DFF,1,4a38,1770,0,100,100,400,200,400,300,258,190,1ca8,1c2,2ee0,fa0,FFFF,0,0,0,0,0,0,0,FFFF,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-G0,Default,5,4000,4000,0,7FB2,7FB2,0,2D33,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,0,ED00,0,0,3FD9,0,C80,FF1A,1B0C,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,179f,0,20,800,2000,2000,fa,C8,1,190,40,20,3977,40,408A,800,63,4DFF,4DFF,2,5208,1F40,0,106,161,800,200,1912,300,258,32,1ca8,C8,2D55,100,FFFF,0,FF80,FBDB,FCEB,E8,F0B1,3C90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-G1,HTC BH S100,5,4000,4000,0,4000,7FB2,FFFF,2D33,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,0,ED00,0,FFFF,3FD9,0,C80,FF9A,1B0C,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,179f,0,14,800,2000,2000,fa,46,1,190,40,20,4650,40,41a0,800,63,4DFF,4DFF,1,3F00,7D0,0,40,100,400,200,400,300,258,32,1ca8,1c2,2EE0,fa0,FFFF,0,FF80,FBDB,FCEB,E8,F0B1,3C90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-G2,HTC BH M100,5,4000,4000,0,5A67,5A67,FFFF,3FD9,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,0,ED00,0,FFFF,3FD9,0,1180,FF1A,1D80,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,179f,0,20,800,2000,2000,fa,78,1,190,40,20,3977,40,408A,800,63,4DFF,4DFF,2,3F00,BB8,0,40,100,400,200,400,300,258,32,1ca8,C8,2D55,100,FFFF,0,FF80,FBDB,FCEB,E8,F0B1,3C90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-G3,Motorola H500,5,4000,4000,0,7FB2,7FB2,FFFF,3FD9,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,0,ED00,0,FFFF,3FD9,0,F00,FF1A,1D80,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,179f,0,20,800,2000,2000,fa,78,1,190,40,20,3977,40,408A,800,63,4DFF,4DFF,2,3F00,BB8,0,40,100,400,200,400,300,258,32,1ca8,C8,2D55,100,FFFF,0,FF80,FBDB,FCEB,E8,F0B1,3C90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-G4,Nokia HS-36W,5,4000,4000,0,7FB2,B45F,FFFF,3FD9,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,0,ED00,0,FFFF,3FD9,0,780,FF1A,1D80,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,179f,0,40,800,2000,2000,fa,78,1,190,40,20,3977,40,408A,800,63,4DFF,4DFF,2,3F00,7D0,0,20,100,200,200,400,300,258,32,1ca8,C8,2D55,100,FFFF,0,FF80,FBDB,FCEB,E8,F0B1,3C90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-G5,PLT 510v.D,5,4000,4000,0,4000,4000,FFFF,2D33,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,0,ED00,0,FFFF,3FD9,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,179f,0,20,800,2000,2000,fa,78,1,190,40,20,3977,40,408A,800,63,4DFF,4DFF,2,3F00,7D0,0,20,100,200,200,400,300,258,32,1ca8,C8,2D55,100,FFFF,0,FF80,FBDB,FCEB,E8,F0B1,3C90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-G6,M2500 by Plantronics,5,4000,4000,0,4000,4000,FFFF,2D33,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,0,ED00,0,FFFF,3FD9,0,C80,FF1A,1B0C,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,179f,0,20,800,2000,2000,fa,C8,1,190,40,20,3977,40,408A,800,63,4DFF,4DFF,2,3F00,7D0,0,20,100,400,200,400,300,258,32,1ca8,C8,2D55,100,FFFF,0,FF80,FBDB,FCEB,E8,F0B1,3C90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-G7,Nokia HDW-3,5,4000,4000,0,5092,7FB2,FFFF,2D33,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,0,ED00,0,FFFF,3FD9,0,C80,FF1A,1B0C,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,179f,0,20,800,2000,2000,fa,C8,1,190,40,20,3977,40,408A,800,63,4DFF,4DFF,2,3F00,BB8,0,40,100,200,200,400,300,258,32,1ca8,C8,2D55,100,FFFF,0,FF80,FBDB,FCEB,E8,F0B1,3C90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-G8,HBH-608,5,4000,4000,0,5A67,7FB2,FFFF,2D33,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,0,ED00,0,FFFF,3FD9,0,C80,FF1A,1B0C,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,179f,0,20,800,2000,2000,fa,C8,1,190,40,20,3977,40,408A,800,63,4DFF,4DFF,2,3F00,7D0,0,20,100,200,200,400,300,258,32,1ca8,C8,2D55,100,FFFF,0,FF80,FBDB,FCEB,E8,F0B1,3C90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-G9,HBH-DS970,5,4000,4000,0,5092,7FB2,FFFF,2D33,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,0,ED00,0,FFFF,3FD9,0,C80,FF1A,1B0C,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,179f,0,30,800,2000,2000,fa,78,1,190,40,20,3977,40,408A,800,63,4DFF,4DFF,2,3F00,7D0,0,10,100,200,200,400,300,258,32,1ca8,C8,2D55,100,FFFF,0,FF80,FBDB,FCEB,E8,F0B1,3C90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-G10,i.Tech BlueBAND,5,4000,4000,0,7FB2,7FB2,FFFF,2D33,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,0,ED00,0,FFFF,3FD9,0,C80,FF1A,1B0C,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,179f,0,20,800,2000,2000,fa,78,1,190,40,20,3977,40,408A,800,63,4DFF,4DFF,2,3F00,7D0,0,40,100,200,200,400,300,258,32,1ca8,C8,2D55,100,FFFF,0,FF80,FBDB,FCEB,E8,F0B1,3C90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-G11,Nokia BH-800,5,4000,4000,0,7FB2,5A67,FFFF,2D33,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,0,ED00,0,0,3FD9,0,780,FF9A,1B0C,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,179f,0,78,800,2000,2000,fa,C8,1,190,40,20,3977,40,408A,800,63,4DFF,4DFF,2,3F00,BB8,0,60,100,800,400,400,300,258,32,1ca8,300,2D55,100,FFFF,0,FF80,FBDB,FCEB,E8,F0B1,3C90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-G12,Motorola H700,5,4000,4000,0,5A67,5A67,0,3FD9,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,0,ED00,0,0,3FD9,0,F00,FF1A,1D80,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,0,0,20,800,2000,2000,fa,78,1,190,40,20,3977,40,408A,800,63,4DFF,4DFF,2,3F00,BB8,0,40,100,400,200,400,300,258,32,1ca8,C8,2D55,100,FFFF,0,FF21,FD5D,FB9C,FA19,F8A4,3C90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-G13,HTC BH M200,5,4000,4000,0,4000,7FB2,0,3FD9,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,0,ED00,0,0,3FD9,0,F00,FF1A,1D80,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,0,0,20,800,2000,2000,fa,78,1,190,40,20,3977,40,408A,800,63,4DFF,4DFF,2,3F00,BB8,0,40,100,400,200,400,300,258,32,1ca8,C8,2D55,100,FFFF,0,0,0,0,0,0,4000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-G14,Jabra JX10,5,4000,4000,0,5A67,7FB2,FFFF,2D33,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,0,ED00,0,0,3FD9,0,C80,FF1A,1B0C,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,179f,0,60,800,2000,2000,fa,C8,1,190,40,20,3977,40,408A,800,63,4DFF,4DFF,2,3F00,7D0,0,20,100,400,200,400,300,258,32,1ca8,C8,2D55,100,FFFF,0,FF80,FBDB,FCEB,E8,F0B1,3C90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-G15,320Plantronics,5,4000,4000,0,7FB2,7FB2,FFFF,2D33,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,0,ED00,0,0,3FD9,0,C80,FF1A,1B0C,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,179f,0,20,800,2000,2000,fa,C8,1,190,40,20,3977,40,408A,800,63,4DFF,4DFF,2,3F00,7D0,0,20,100,400,200,400,300,258,32,1ca8,C8,2D55,100,FFFF,0,FF80,FBDB,FCEB,E8,F0B1,3C90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-G16,640Plantronics,5,4000,4000,0,7FB2,4000,0,2D33,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,0,ED00,0,0,3FD9,0,C80,FF1A,1B0C,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,179f,0,20,800,2000,2000,fa,C8,1,190,40,20,3977,40,408A,800,63,4DFF,4DFF,2,4000,BB8,0,20,161,400,200,400,300,258,32,1ca8,400,2D55,100,FFFF,0,FF21,FD5D,FB9C,FA19,F8A4,3C90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-G17,Jabra BT500,5,4000,4000,0,7FB2,5A67,0,2D33,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,0,ED00,0,0,3FD9,0,C80,FF1A,1B0C,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,179f,0,20,800,2000,2000,fa,C8,1,190,40,20,3977,40,408A,800,63,4DFF,4DFF,2,4000,BB8,0,40,161,800,200,400,300,258,32,1ca8,C8,2D55,100,FFFF,0,FF80,FBDB,FCEB,E8,F0B1,3C90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-G18,Motorola HT820,5,4000,4000,0,5092,7FB2,0,2D33,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,0,ED00,0,0,3FD9,0,C80,FF1A,1B0C,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,0,0,20,800,2000,2000,fa,C8,1,190,40,20,3977,40,408A,800,63,4DFF,4DFF,2,3F00,7D0,0,40,100,200,200,400,300,258,32,1ca8,C8,2D55,100,FFFF,0,FF10,FCC8,F8A0,F4F2,F04B,65AD,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-G19,HBH-IV840,5,4000,4000,0,7FB2,7FB2,0,2D33,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,0,ED00,0,0,2D33,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,0,0,20,800,2000,2000,fa,78,1,190,40,20,3977,40,408A,800,63,4DFF,4DFF,2,3F00,7D0,0,20,100,200,200,400,300,258,64,1ca8,C8,2D55,100,FFFF,0,FF80,FBDB,FCEB,E8,F0B1,3C90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-G20,6XXPlantronics,5,4000,4000,0,7FB2,A0C2,0,2D33,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,0,ED00,0,0,3FD9,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,179f,0,20,800,2000,2000,fa,C8,1,190,40,20,3977,40,408A,800,63,4DFF,4DFF,2,3F00,7D0,0,0,0,0,0,400,300,258,64,1ca8,C8,2D55,100,FFFF,0,FF80,FBDB,FCEB,E8,F0B1,3C90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-G21,3xxPlantronics,5,4000,4000,0,5A67,4000,FFFF,2D33,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,0,ED00,0,FFFF,3FD9,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,179f,0,80,800,1500,2000,fa,78,1,190,40,20,3977,40,408A,800,63,4DFF,4DFF,2,3F00,BB8,0,20,100,100,200,400,300,258,64,1ca8,C8,2D55,100,FFFF,0,FF80,FBDB,FCEB,E8,F0B1,3C90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-G22,HBH-PV710,5,4000,4000,0,71CF,4000,FFFF,2D33,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,0,ED00,0,FFFF,2D33,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,179f,0,80,800,2000,2000,fa,78,1,190,40,20,3977,40,408A,800,63,4DFF,4DFF,2,3F00,7D0,0,20,100,200,200,400,300,258,64,1ca8,C8,2D55,100,FFFF,0,FF80,FBDB,FCEB,E8,F0B1,3C90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-G23,Motorola H670,5,4000,4000,0,7FB2,7FB2,FFFF,2D33,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,0,ED00,0,FFFF,3FD9,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,179f,0,80,800,2000,2000,fa,78,1,190,40,20,3977,40,408A,800,63,4DFF,4DFF,2,3F00,7D0,0,20,100,100,200,400,300,258,64,1ca8,C8,2D55,100,FFFF,0,FF80,FBDB,FCEB,E8,F0B1,3C90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-G24,HBM-300,5,4000,4000,0,7FB2,7FB2,FFFF,2D33,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,0,ED00,0,FFFF,2D33,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,179f,0,70,800,2000,2000,fa,78,1,190,40,20,3977,40,408A,800,63,4DFF,4DFF,2,3F00,7D0,0,20,100,200,200,400,300,258,64,1ca8,C8,2D55,100,FFFF,0,FF80,FBDB,FCEB,E8,F0B1,3C90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-G25,Nokia BH-208,5,4000,4000,0,5A67,7FB2,FFFF,2000,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,0,ED00,0,FFFF,2D33,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,179f,0,70,800,2000,2000,fa,C8,1,190,40,20,3977,40,408A,800,63,4DFF,4DFF,2,3F00,7D0,0,20,100,200,200,400,300,258,64,1ca8,C8,2D55,100,FFFF,0,FF80,FBDB,FCEB,E8,F0B1,3C90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-G26,Samsung WEP410,5,4000,4000,0,7FB2,2D4E,FFFF,2000,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,0,ED00,0,FFFF,2D33,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,179f,0,20,800,2000,2000,fa,78,1,190,40,20,3977,40,408A,800,63,4DFF,4DFF,2,3F00,7D0,0,0,100,200,150,400,300,258,64,1ca8,C8,2D55,100,FFFF,0,FF80,FBDB,FCEB,E8,F0B1,3C90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-G27,Jabra BT8010,5,4000,4000,0,7FB2,71CF,0,2D33,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,0,ED00,0,0,3FD9,0,C80,FF1A,1B0C,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,0,0,30,800,2000,2000,fa,78,1,190,40,20,3977,40,408A,800,63,4DFF,4DFF,2,3F00,7D0,0,10,100,200,200,400,300,258,64,1ca8,C8,2D55,100,FFFF,0,FF80,FBDB,FCEB,E8,F0B1,3C90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-G28,Motorola S9,5,4000,4000,0,7FB2,4000,0,3FD9,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,0,ED00,0,0,3FD9,0,F00,FF1A,1D80,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,0,0,20,800,2000,2000,fa,78,1,190,40,20,3977,40,408A,800,63,4DFF,4DFF,2,3F00,BB8,0,40,100,400,200,400,300,258,64,1ca8,C8,2D55,100,FFFF,0,FF21,FD5D,FB9C,FA19,F8A4,3C90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-G29,Jabra BT620s,5,4000,4000,0,5A67,7FB2,FFFF,2D33,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,0,ED00,0,0,3FD9,0,C80,FF1A,1B0C,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,179f,0,270,800,2000,2000,fa,C8,1,190,40,20,3977,40,408A,800,63,4DFF,4DFF,2,4000,BB8,0,40,100,200,200,400,300,258,64,1ca8,C8,2D55,100,FFFF,0,FF80,FBDB,FCEB,E8,F0B1,3C90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-G30,Nokia BH-902,5,4000,4000,0,71CF,7FB2,FFFF,2D33,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,0,ED00,0,FFFF,2D33,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,0,0,70,800,2000,2000,fa,C8,1,190,40,20,3977,40,408A,800,63,4DFF,4DFF,2,3F00,7D0,0,20,100,200,200,400,300,258,64,1ca8,C8,2D55,100,FFFF,0,FF80,FBDB,FCEB,E8,F0B1,3C90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-G31,HBH-DS220,5,4000,4000,0,4000,B45F,FFFF,2D33,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,0,ED00,0,0,2D33,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,0,0,20,800,2000,2000,fa,78,1,190,40,20,3977,40,408A,800,63,4DFF,4DFF,2,3F00,7D0,0,20,100,200,200,400,300,258,64,1ca8,C8,2D55,100,FFFF,0,FF80,FBDB,FCEB,E8,F0B1,3C90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-G32,HBH-DS980,5,4000,4000,0,5092,7FB2,FFFF,2D33,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,0,ED00,0,FFFF,2D33,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,179f,0,30,800,2000,2000,fa,78,1,190,40,20,3977,40,408A,800,63,4DFF,4DFF,2,3F00,7D0,0,10,100,200,200,400,300,258,32,1ca8,C8,2D55,100,FFFF,0,FF80,FBDB,FCEB,E8,F0B1,3C90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-G33,BT_EC_OFF,5,4000,4000,0,7FB2,7FB2,0,2D33,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,0,ED00,0,0,3FD9,0,C80,FF1A,1B0C,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,0,0,11,800,2000,2000,fa,C8,1,190,40,20,3977,40,408A,800,63,4DFF,4DFF,2,5208,1F40,0,106,161,800,200,1912,300,258,32,1ca8,C8,2D55,100,FFFF,0,0,0,0,0,0,4000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-G34,8XXPlantronics,5,4000,4000,0,7FB2,7FB2,0,3FD9,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,0,ED00,0,0,3FD9,0,F00,FF1A,1D80,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,179F,0,0,800,2000,2000,fa,190,1,190,40,20,3977,40,408A,800,63,4DFF,4DFF,2,4000,BB8,0,40,100,200,200,400,300,258,64,1ca8,C8,2D55,100,FFFF,0,FF80,FBDB,FCEB,E8,F0B1,3C90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-G35,Palm Headset,5,4000,4000,0,4000,4000,FFFF,2000,0,C80,FF03,2080,F333,01EC,FFEE,200A,7F65,0,ED00,0,FFFF,2000,0,780,FF9A,2080,F333,01EC,FFEE,200A,7F65,7FFF,800,21DB,149F,0,78,800,5A30,2000,1A4,C8,2,190,40,20,3977,40,408A,800,63,4DFF,4DFF,2,5208,1F40,0,50,161,800,200,1912,300,258,190,1CA8,C8,2D55,100,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-G36,Jawbone,5,4000,4000,0,4000,7FB2,0,7F65,0,780,FF9A,1B0C,F333,01EC,FFEE,200A,7F65,0,ED00,0,0,2000,0,0C80,FF9A,2100,F333,01EC,FFEE,200A,7F65,7FFF,800,21DB,0,0,78,800,5A30,2000,1A4,C8,2,190,40,20,3977,40,408A,800,63,4DFF,4DFF,2,5208,1F40,0,50,161,800,200,1912,300,258,190,1214,C8,2D55,100,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-G37,Jawbone1234,5,4000,4000,0,4000,7FB2,0,7F65,0,780,FF9A,1B0C,F333,01EC,FFEE,200A,7F65,0,ED00,0,0,2000,0,0C80,FF9A,2100,F333,01EC,FFEE,200A,7F65,7FFF,800,21DB,0,0,78,800,5A30,2000,1A4,C8,2,190,40,20,3977,40,408A,800,63,4DFF,4DFF,2,5208,1F40,0,50,161,800,200,1912,300,258,190,1214,C8,2D55,100,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-G38,590Plantronics,5,4000,4000,0,7FB2,4000,FFFF,2000,0,780,FF03,2400,F333,01EC,FFEE,200A,7F65,0,ED00,600,FFFF,2000,0,0C80,FF03,2400,F333,01EC,FFEE,200A,7F65,7FFF,800,21DB,149F,0,78,800,5A30,2000,1A4,C8,2,190,40,20,3977,40,408A,800,63,4DFF,4DFF,2,5DC0,2EE0,0,50,161,800,2BC,1912,300,258,190,1CA8,300,2D55,100,FFFF,F76E,FD79,FD34,FCFB,FCCF,FCB3,3F6B,0,13,ffdc,fdaa,ff4e,f955,fa96,3ebe,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-G39,Audi UHV 6384,5,4000,4000,0,7FB2,4000,0,2000,0,780,FF9A,2080,F333,01EC,FFEE,200A,7F65,0,ED00,600,0,2000,0,0C80,FF9A,2080,F333,01EC,FFEE,200A,7F65,7FFF,800,21DB,0,0,78,800,2000,2000,1A4,C8,2,190,40,20,3977,40,408A,800,63,4DFF,4DFF,2,5DC0,2EE0,0,106,161,800,2BC,1912,300,258,190,1CA8,300,2D55,100,FFFF,0,FFA1,FE78,FCB2,FAC4,F944,78BA,0,0,FFC1,FEFD,FDD1,FC8B,FB8D,7B32,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-G40,BlueConnect(tm),5,4000,4000,0,5A67,4000,0,2000,0,780,FF9A,2100,F333,01EC,FFEE,200A,7F65,0,ED00,600,0,2000,0,0C80,FF9A,2100,F333,01EC,FFEE,200A,7F65,7FFF,800,21DB,0,0,78,800,2000,2000,1A4,C8,2,190,40,20,3977,40,408A,800,63,4DFF,4DFF,2,5DC0,2EE0,0,106,161,800,2BC,1912,300,258,190,1CA8,300,2D55,100,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-G41,HandsFreeLink TM,5,4000,4000,0,5A67,4000,0,2000,0,780,FF9A,2100,F333,01EC,FFEE,200A,7F65,0,ED00,600,0,2000,0,0C80,FF9A,2100,F333,01EC,FFEE,200A,7F65,7FFF,800,21DB,0,0,78,800,2000,2000,1A4,C8,2,190,40,20,3977,40,408A,800,63,4DFF,4DFF,2,5DC0,2EE0,0,106,161,800,2BC,1912,300,258,190,1CA8,300,2D55,100,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-G42,Parrot 3400LS,5,4000,4000,0,7FB2,4000,0,2000,0,780,FF9A,1B0C,F333,01EC,FFEE,200A,7F65,0,ED00,600,0,2000,0,780,FF9A,1B0C,F333,01EC,FFEE,200A,7F65,7FFF,800,21DB,0,0,78,800,2000,2000,1A4,C8,2,190,40,20,3977,40,408A,800,63,4DFF,4DFF,2,5DC0,2EE0,0,106,161,800,2BC,1912,300,258,190,1CA8,300,2D55,100,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-G43,BMW,5,4000,4000,0,7FB2,4000,0,2000,0,780,FF9A,2080,F333,01EC,FFEE,200A,7F65,0,ED00,600,0,2000,0,0C80,FF9A,2080,F333,01EC,FFEE,200A,7F65,7FFF,800,21DB,0,0,78,800,2000,2000,1A4,C8,2,190,40,20,3977,40,408A,800,63,4DFF,4DFF,2,5DC0,2EE0,0,106,161,800,2BC,1912,300,258,190,1CA8,300,2D55,100,FFFF,0,FFA1,FE78,FCB2,FAC4,F944,78BA,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-G44,Motorola H350,5,4000,4000,0,656E ,CA62 ,FFFF ,2000,0,C80,FF03 ,2300,F333 ,01EC ,FFEE ,200A ,7F65 ,0,0,0,0,7F65 ,0,780,FF9A ,1B0C ,F333 ,01EC ,FFEE ,200A ,7F65 ,7FFF ,800,21DB ,179F ,0,96,800,5A30 ,2000,1A4 ,A0 ,2,190,40,20,3977,40,408A ,800,63,4DFF,4DFF,2,4C00 ,1A00 ,0,20,161,800,200,1912,300,258,190,1CA8 ,50,2D55 ,100,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-G45,Jabra BT135,5,4000,4000,0,7FB2 ,4000,FFFF ,4000,0,1180,FF03 ,2400,F333 ,01EC ,FFEE ,200A ,7F65 ,0,0,0,FFFF ,2880,0,0C80 ,FF03 ,2400,F333 ,01EC ,FFEE ,200A ,7F65 ,7FFF ,800,21DB ,179F ,0,78,800,5A30 ,2000,1A4 ,C8 ,2,190,40,20,3977,40,408A ,800,63,4DFF,4DFF,2,5208,1F40 ,0,20,161,800,200,1912,300,258,190,1CA8 ,C8 ,2D55 ,100,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-G46,Jabra BT160,5,4000,4000,0,6500,6000,FFFF,2000,0,1180,FF03,2000,F333,01EC,FFEE,200A,7F65,0,ED00,600,FFFF,2000,0,0C80,FF03,2400,F333,01EC,FFEE,200A,7F65,7FFF,800,21DB,179F,0,70,800,2000,2000,1A4,C8,2,190,40,20,3977,40,408A,800,63,4DFF,4DFF,2,5208,1F40,0,50,161,800,200,1912,300,258,190,1CA8,C8,2D55,100,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-G47,Motorola H721,5,4000,4000,0,71CF,2D4E,0,2D33,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,0,ED00,0,0,3FD9,0,C80,FF1A,1B0C,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,179f,0,200,800,2000,2000,fa,46,1,190,40,20,3977,40,408A,800,63,4DFF,4DFF,2,3F00,1200,0,20,100,200,200,400,300,258,32,1ca8,1000,2D55,100,FFFF,0,FF21,FD5D,FB9C,FA19,F8A4,3C90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-G48,Jabra BT8040,5,4000,4000,0,7FB2,7FB2,0,2D33,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,0,ED00,0,0,3FD9,0,C80,FF1A,1B0C,F333,01EC,FFEE,200A,7F65,7FFF,800,7FFF,4,0,20,800,2000,2000,fa,C8,1,190,40,20,3977,40,408A,800,63,4DFF,4DFF,2,3F00,7D0,0,100,100,200,200,400,300,200,64,1ca8,C8,2D55,100,FFFF,0,FF2D,FD74,FBA1,F9F6,F864,3C90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-G49,DoCoMo Wireless P01,5,4000,4000,0,FEC9,7FB2,0,2D33,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,0,ED00,0,FFFF,3FD9,0,C80,FF1A,1B0C,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,179f,0,20,800,2000,2000,fa,C8,1,190,40,20,3977,40,408A,800,63,4DFF,4DFF,2,5208,1F40,0,40,100,400,200,400,300,258,32,1ca8,C8,2D55,100,FFFF,0,FF80,FBDB,FCEB,E8,F0B1,3C90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-G50,SoundLeaf+,5,4000,4000,0,B45F,7FB2,0,2D33,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,0,ED00,0,FFFF,3FD9,0,C80,FF1A,1B0C,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,179f,0,50,800,2000,2000,fa,C8,1,190,40,20,3977,40,408A,800,63,4DFF,4DFF,2,3F00,7D0,0,40,100,400,200,400,300,258,32,1ca8,C8,2D55,100,FFFF,0,FF80,FBDB,FCEB,E8,F0B1,3C90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-G51,Nokia BH-103,5,4000,4000,0,5A67,7FB2,FFFF,2000,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,0,ED00,0,FFFF,2D33,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,179f,0,A2,800,2000,2000,fa,C8,1,190,40,20,3977,40,408A,800,63,4DFF,4DFF,2,3F00,7D0,0,20,100,200,200,400,300,258,64,1ca8,C8,2D55,100,FFFF,0,FF80,FBDB,FCEB,E8,F0B1,3C90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-G52,Jabra BT500,5,4000,4000,0,7FB2,71CF,0,2D33,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,0,ED00,0,0,3FD9,0,C80,FF1A,1B0C,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,179f,0,10,800,2000,2000,fa,C8,1,190,40,20,3977,40,408A,800,63,4DFF,4DFF,2,4000,BB8,0,40,161,800,200,400,300,258,32,1ca8,C8,2D55,100,FFFF,0,FF80,FBDB,FCEB,E8,F0B1,3C90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
-G53,Jabra BT3030,5,4000,4000,0,5A67,7FB2,FFFF,2000,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,0,ED00,0,FFFF,2D33,0,C80,FF1A,1D80,F333,01EC,FFEE,200A,7F65,7fff,800,7fff,0,0,20,800,2000,2000,fa,C8,1,190,40,20,3977,40,408A,800,63,4DFF,4DFF,2,3F00,7D0,0,20,100,200,200,400,300,258,64,1ca8,C8,2D55,100,FFFF,0,FF80,FBDB,FCEB,E8,F0B1,3C90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,FFFF
diff --git a/prebuilt/dream_sapphire/etc/init.d/02audio_profile b/prebuilt/dream_sapphire/etc/init.d/02audio_profile
deleted file mode 100755
index 39b03bc..0000000
--- a/prebuilt/dream_sapphire/etc/init.d/02audio_profile
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/system/bin/sh
-
-if [ ! -e /system/etc/AudioPara4.csv ];
-then
-	mount -o remount,rw /system
-	if [ `getprop ro.product.device` = "dream" ];
-	then
-		ln -s /system/etc/AudioPara_dream.csv /system/etc/AudioPara4.csv
-	else
-		ln -s /system/etc/AudioPara_sapphire.csv /system/etc/AudioPara4.csv
-	fi
-	mount -o remount,ro /system
-fi	
diff --git a/prebuilt/hdpi/media/bootanimation.zip b/prebuilt/hdpi/media/bootanimation.zip
deleted file mode 100644
index 4936573..0000000
--- a/prebuilt/hdpi/media/bootanimation.zip
+++ /dev/null
Binary files differ
diff --git a/prebuilt/ldpi/media/bootanimation.zip b/prebuilt/ldpi/media/bootanimation.zip
deleted file mode 100644
index e68a456..0000000
--- a/prebuilt/ldpi/media/bootanimation.zip
+++ /dev/null
Binary files differ
diff --git a/prebuilt/mdpi/media/bootanimation.zip b/prebuilt/mdpi/media/bootanimation.zip
deleted file mode 100644
index a005b8b..0000000
--- a/prebuilt/mdpi/media/bootanimation.zip
+++ /dev/null
Binary files differ
diff --git a/prelink-linux-arm-hero.map b/prelink-linux-arm-hero.map
deleted file mode 100644
index a65cf79..0000000
--- a/prelink-linux-arm-hero.map
+++ /dev/null
@@ -1,211 +0,0 @@
-# 0xC0000000 - 0xFFFFFFFF Kernel
-# 0xB0100000 - 0xBFFFFFFF Thread 0 Stack
-# 0xB0000000 - 0xB00FFFFF Linker
-# 0xA0000000 - 0xBFFFFFFF Prelinked System Libraries
-# 0x90000000 - 0x9FFFFFFF Prelinked App Libraries
-# 0x80000000 - 0x8FFFFFFF Non-prelinked Libraries
-# 0x40000000 - 0x7FFFFFFF mmap'd stuff
-# 0x10000000 - 0x3FFFFFFF Thread Stacks
-# 0x00000000 - 0x0FFFFFFF .text / .data / heap
-
-# Note: The general rule is that libraries should be aligned on 1MB
-# boundaries. For ease of updating this file, you will find a comment
-# on each line, indicating the observed size of the library, which is
-# one of:
-#
-#     [<64K] observed to be less than 64K
-#     [~1M] rounded up, one megabyte (similarly for other sizes)
-#     [???] no size observed, assumed to be one megabyte
-
-# core system libraries
-libdl.so                0xAFF00000 # [<64K]
-libc.so                 0xAFD00000 # [~2M]
-libstdc++.so            0xAFC00000 # [<64K]
-libm.so                 0xAFB00000 # [~1M]
-liblog.so               0xAFA00000 # [<64K]
-libcutils.so            0xAF900000 # [~1M]
-libthread_db.so         0xAF800000 # [<64K]
-libz.so                 0xAF700000 # [~1M]
-libevent.so             0xAF600000 # [???]
-libssl.so               0xAF400000 # [~2M]
-libcrypto.so            0xAF000000 # [~4M]
-libsysutils.so          0xAEF00000 # [~1M]
-
-# bluetooth
-liba2dp.so              0xAEE00000 # [~1M]
-audio.so                0xAED00000 # [~1M]
-input.so                0xAEC00000 # [~1M]
-libbluetoothd.so        0xAEA00000 # [~2M]
-libbluedroid.so         0xAE900000 # [<64K]
-libbluetooth.so         0xAE800000 # [~1M]
-libdbus.so              0xAE700000 # [~1M]
-
-# extended system libraries
-libril.so               0xAE600000 # [~1M]
-libreference-ril.so     0xAE500000 # [~1M]
-libwpa_client.so        0xAE400000 # [<64K]
-libnetutils.so          0xAE300000 # [~1M]
-
-# core dalvik runtime support
-libandroid_servers.so   0xAE200000 # [~1M]
-libicuuc.so             0xADE00000 # [~4M]
-libicui18n.so           0xAD900000 # [~5M]
-libandroid_runtime.so   0xAD300000 # [~6M]
-libnativehelper.so      0xAD100000 # [~2M]
-libdvm-ARM.so           0xAD000000 # [???]
-libdvm.so               0xACA00000 # [~6M]
-# Note: libicudata.so intentionally omitted
-
-# graphics
-libpixelflinger.so      0xAC900000 # [~1M]
-# libcorecg is for backward-compatibility with donut
-libcorecg.so            0xAC800000 # [???]
-libsurfaceflinger_client.so 0xAC700000 # [~1M]
-libsurfaceflinger.so    0xAC500000 # [~2M]
-libGLES_android.so      0xAC400000 # [~1M]
-libagl.so               0xAC300000 # [???]
-
-libGLESv1_CM.so         0xAC200000 # [~1M]
-libGLESv2.so            0xAC100000 # [~1M]
-libOpenVG_CM.so         0xAC000000 # [???]
-libOpenVGU_CM.so        0xABF00000 # [???]
-libEGL.so               0xABE00000 # [~1M]
-libETC1.so              0xABD00000 # [<64K]
-
-libacc.so               0xABC00000 # [~1M]
-
-libexif.so              0xABB00000 # [~1M]
-libcamera_client.so     0xABA80000 # [~1M]
-libui.so                0xAB900000 # [~1M]
-# libsgl is for backward-compatibility with donut
-libgui.so               0xAB880000 # [~1M]
-libsgl.so               0xAB800000 # [???]
-libskia.so              0xAB100000 # [~7M]
-librs_jni.so            0xAB000000 # [~1M]
-libRS.so                0xA9E00000 # [~2M]
-libandroid.so           0xA9D80000 # [<64K]
-libjnigraphics.so       0xA9D00000 # [<64K]
-libskiagl.so            0xA9C00000 # [~1M]
-
-# audio
-libFLAC.so              0xA9B00000 # [???]
-libaudiopolicy.so       0xA9A00000 # [~1M]
-libeffects.so           0xA9980000 # [<64K]
-libaudioeffect_jni.so   0xA9900000 # [<64K]
-libaudiopolicygeneric.so 0xA9880000 # [???]
-libsoundpool.so         0xA9800000 # [~1M]
-libgps.so               0xA9700000 # [~1M] (moved for hero)
-libcamera.so            0xA9680000 # [~1M] (moved for hero)
-liboemcamera.so         0xA9400000 # [~2M] (moved for hero)
-libmedia_jni.so         0xA9300000 # [~1M]
-libmediaplayerservice.so 0xA9200000 # [~1M]
-libmedia.so             0xA9000000 # [~2M]
-libFFTEm.so             0xA8F00000 # [~1M]
-libSR_AudioIn.so        0xA8E00000 # [~1M] for external/srec
-libaudioflinger.so      0xA8D00000 # [~1M]
-
-# assorted system libraries
-libsqlite.so            0xA8B00000 # [~2M]
-libexpat.so             0xA8A00000 # [~1M]
-libwebcore.so           0xA8300000 # [~7M]
-libbinder.so            0xA8200000 # [~1M]
-libutils.so             0xA8100000 # [~1M]
-libcameraservice.so     0xA8000000 # [~1M]
-libhardware.so          0xA7F00000 # [<64K]
-libhardware_legacy.so   0xA7E00000 # [~1M]
-libapp_process.so       0xA7D00000 # [???]
-libsystem_server.so     0xA7C00000 # [~1M]
-libime.so               0xA7B00000 # [???]
-libaudio.so             0xA7A00000 # [~1M] (moved for hero)
-libspeech.so            0xA7900000 # [~1M] (moved for hero)
-libsonivox.so           0xA7800000 # [~1M] (moved for hero)
-libvorbisidec.so        0xA7700000 # [~1M] (moved for hero)
-libdiskconfig.so        0xA7600000 # [<64K]
-libemoji.so             0xA7500000 # [<64K]
-libjni_latinime.so      0xA7400000 # [~1M]
-libjni_pinyinime.so     0xA7300000 # [~1M]
-libttssynthproxy.so     0xA7200000 # [~1M] for frameworks/base
-libttspico.so           0xA7000000 # [~2M] for external/svox
-
-# pv libraries
-libpvasf.so                    0xA6F00000 # [???]
-libpvasfreg.so                 0xA6E00000 # [???]
-libomx_sharedlibrary.so        0xA6D00000 # [~1M]
-libopencore_download.so        0xA6C00000 # [~1M]
-libopencore_downloadreg.so     0xA6B00000 # [~1M]
-libopencore_net_support.so     0xA6800000 # [~3M]
-libopencore_rtsp.so            0xA6200000 # [~6M]
-libopencore_rtspreg.so         0xA6100000 # [~1M]
-libopencore_author.so          0xA5D00000 # [~4M]
-libomx_aacdec_sharedlibrary.so 0xA5B00000 # [~2M]
-libomx_amrdec_sharedlibrary.so 0xA5A00000 # [~1M]
-libomx_amrenc_sharedlibrary.so 0xA5900000 # [~1M]
-libomx_avcdec_sharedlibrary.so 0xA5800000 # [~1M]
-libomx_avcenc_sharedlibrary.so 0xA5700000 # [???]
-libomx_m4vdec_sharedlibrary.so 0xA5600000 # [~1M]
-libomx_m4venc_sharedlibrary.so 0xA5500000 # [???]
-libomx_mp3dec_sharedlibrary.so 0xA5400000 # [~1M]
-libopencore_mp4local.so        0xA5200000 # [~2M]
-libopencore_mp4localreg.so     0xA5100000 # [~1M]
-libopencore_player.so          0xA4800000 # [~9M]
-
-# opencore hardware support
-libmm-adspsvc.so              0xA4700000 # [<64K]
-libOmxCore.so                 0xA4600000 # [<64K]
-libOmxMpeg4Dec.so             0xA4500000 # [~1M]
-libOmxH264Dec.so              0xA4400000 # [~1M]
-libOmxVidEnc.so               0xA4300000 # [~1M]
-libopencorehw.so              0xA4200000 # [~1M]
-libOmxVdec.so                 0xA4100000 # [~1M]
-libmm-omxcore.so              0xA4000000 # [<64K]
-
-# pv libraries
-libopencore_common.so         0xA3900000 # [~7M]
-libqcomm_omx.so               0xA3800000 # [<64K]
-
-# stagefright libraries
-libstagefright_amrnb_common.so     0xA3700000 # [~1M]
-libstagefright_avc_common.so       0xA3600000 # [~1M]
-libstagefright_color_conversion.so 0xA3500000 # [<64K]
-libstagefright_omx.so              0xA3400000 # [~1M]
-libstagefrighthw.so                0xA3300000 # [~1M]
-libstagefright.so                  0xA2F00000 # [~4M]
-
-# libraries for specific hardware
-libgsl.so               0xA2E00000 # [~1M]
-libhtc_acoustic.so      0xA2D00000 # [<64K]
-libhtc_ril.so           0xA2C00000 # [~1M]
-liblvmxipc.so           0xA2B00000 # [~1M] for vendor/nxp
-libreference-cdma-sms.so 0xA2A00000 # [<64K] for hardware/ril
-
-# libraries for specific apps or temporary libraries
-libcam_ipl.so           0x9F000000 # [???]
-libwbxml.so             0x9EF00000 # [???]
-libwbxml_jni.so         0x9EE00000 # [~1M]
-libxml2wbxml.so         0x9EB00000 # [~1M]
-libdrm1.so              0x9EA00000 # [~1M]
-libdrm1_jni.so          0x9E900000 # [<64K]
-libwapcore.so           0x9E800000 # [???]
-libstreetview.so        0x9E700000 # [???]
-libwapbrowsertest.so    0x9E600000 # [???]
-libminiglobe.so         0x9E500000 # [???]
-libearth.so             0x9E400000 # [???]
-libembunit.so           0x9E300000 # [<64K]
-libneon.so              0x9E200000 # [???]
-libjni_example.so       0x9E100000 # [???]
-libjni_load_test.so     0x9E000000 # [???]
-libjni_lib_test.so      0x9DF00000 # [???]
-librunperf.so           0x9DE00000 # [???]
-libctest.so             0x9DD00000 # [<64K]
-libUAPI_jni.so          0x9DC00000 # [???]
-librpc.so               0x9DB00000 # [~1M]
-libtrace_test.so        0x9DA00000 # [???]
-libsrec_jni.so          0x9D800000 # [~2M]
-libjpeg.so              0x9D700000 # [~1M]
-libiprouteutil.so       0x9D600000 # [~1M] for external/iproute2
-libnetlink.so           0x9D500000 # [<64K] for external/iproute2
-libpagemap.so           0x9D400000 # [<64K] for system/extras/libpagemap
-libstlport.so           0x9D100000 # [~3M] for external/stlport
-libzxing.so             0x9D000000 # [<64K] for goggles
-libinterstitial.so      0x9CF00000 # [<64K] for goggles
-liblept.so              0x9CA00000 # [~5M] for external/leptonica
diff --git a/prelink-linux-arm-msm722x.map b/prelink-linux-arm-msm722x.map
deleted file mode 100644
index 1cef58b..0000000
--- a/prelink-linux-arm-msm722x.map
+++ /dev/null
@@ -1,213 +0,0 @@
-# 0xC0000000 - 0xFFFFFFFF Kernel
-# 0xB0100000 - 0xBFFFFFFF Thread 0 Stack
-# 0xB0000000 - 0xB00FFFFF Linker
-# 0xA0000000 - 0xBFFFFFFF Prelinked System Libraries
-# 0x90000000 - 0x9FFFFFFF Prelinked App Libraries
-# 0x80000000 - 0x8FFFFFFF Non-prelinked Libraries
-# 0x40000000 - 0x7FFFFFFF mmap'd stuff
-# 0x10000000 - 0x3FFFFFFF Thread Stacks
-# 0x00000000 - 0x0FFFFFFF .text / .data / heap
-
-# Note: The general rule is that libraries should be aligned on 1MB
-# boundaries. For ease of updating this file, you will find a comment
-# on each line, indicating the observed size of the library, which is
-# one of:
-#
-#     [<64K] observed to be less than 64K
-#     [~1M] rounded up, one megabyte (similarly for other sizes)
-#     [???] no size observed, assumed to be one megabyte
-#
-# note: look at the LOAD sections in the library header:
-#
-#   arm-eabi-objdump -x <lib>
-#
-
-# core system libraries
-libdl.so                0xAFF00000 # [<64K]
-libc.so                 0xAFD00000 # [~2M]
-libstdc++.so            0xAFC00000 # [<64K]
-libm.so                 0xAFB00000 # [~1M]
-liblog.so               0xAFA00000 # [<64K]
-libcutils.so            0xAF900000 # [~1M]
-libthread_db.so         0xAF800000 # [<64K]
-libz.so                 0xAF700000 # [~1M]
-libevent.so             0xAF600000 # [???]
-libssl.so               0xAF400000 # [~2M]
-libcrypto.so            0xAF000000 # [~4M]
-libsysutils.so          0xAEF00000 # [~1M]
-
-# bluetooth
-liba2dp.so              0xAEE00000 # [~1M]
-audio.so                0xAED00000 # [~1M]
-input.so                0xAEC00000 # [~1M]
-libbluetoothd.so        0xAEA00000 # [~2M]
-libbluedroid.so         0xAE900000 # [<64K]
-libbluetooth.so         0xAE800000 # [~1M]
-libdbus.so              0xAE700000 # [~1M]
-
-# extended system libraries
-libril.so               0xAE600000 # [~1M]
-libreference-ril.so     0xAE500000 # [~1M]
-libwpa_client.so        0xAE400000 # [<64K]
-libnetutils.so          0xAE300000 # [~1M]
-
-# core dalvik runtime support
-libandroid_servers.so   0xAE200000 # [~1M]
-libicuuc.so             0xADE00000 # [~4M]
-libicui18n.so           0xAD900000 # [~5M]
-libandroid_runtime.so   0xAD300000 # [~6M]
-libnativehelper.so      0xAD100000 # [~2M]
-libdvm-ARM.so           0xAD000000 # [???]
-libdvm.so               0xACA00000 # [~6M]
-# Note: libicudata.so intentionally omitted
-
-# graphics
-libpixelflinger.so      0xAC900000 # [~1M]
-# libcorecg is for backward-compatibility with donut
-libcorecg.so            0xAC800000 # [???]
-libsurfaceflinger_client.so 0xAC700000 # [~1M]
-libsurfaceflinger.so    0xAC500000 # [~2M]
-libGLES_android.so      0xAC400000 # [~1M]
-libagl.so               0xAC300000 # [???]
-
-libGLESv1_CM.so         0xAC200000 # [~1M]
-libGLESv2.so            0xAC100000 # [~1M]
-libOpenVG_CM.so         0xAC000000 # [???]
-libOpenVGU_CM.so        0xABF00000 # [???]
-libEGL.so               0xABE00000 # [~1M]
-libETC1.so              0xABD00000 # [<64K]
-
-libacc.so               0xABC00000 # [~1M]
-
-libexif.so              0xABB00000 # [~1M]
-libcamera_client.so     0xABA80000 # [~1M]
-libui.so                0xAB900000 # [~1M]
-libgui.so               0xAB800000 # [~1M]
-libskia.so              0xAB100000 # [~2M]
-librs_jni.so            0xAB000000 # [~1M]
-libRS.so                0xA9E00000 # [~2M]
-libandroid.so           0xA9D80000 # [<64K]
-libjnigraphics.so       0xA9D00000 # [<64K]
-libskiagl.so            0xA9C00000 # [~1M]
-
-# audio
-libFLAC.so              0xA9B00000 # [???]
-libaudiopolicy.so       0xA9A00000 # [~1M]
-libeffects.so           0xA9980000 # [<64K]
-libaudioeffect_jni.so   0xA9900000 # [<64K]
-libsoundpool.so         0xA9800000 # [~1M]
-libaudio.so             0xA9700000 # [~1M]
-libspeech.so            0xA9600000 # [~1M]
-libsonivox.so           0xA9500000 # [~1M]
-libvorbisidec.so        0xA9400000 # [~1M]
-libmedia_jni.so         0xA9300000 # [~1M]
-libmediaplayerservice.so 0xA9200000 # [~1M]
-libmedia.so             0xA9000000 # [~2M]
-libFFTEm.so             0xA8F00000 # [~1M]
-libSR_AudioIn.so        0xA8E00000 # [~1M] for external/srec
-libaudioflinger.so      0xA8D00000 # [~1M]
-
-# assorted system libraries
-libsqlite.so            0xA8B00000 # [~2M]
-libexpat.so             0xA8A00000 # [~1M]
-libwebcore.so           0xA8300000 # [~7M]
-libbinder.so            0xA8200000 # [~1M]
-libutils.so             0xA8100000 # [~1M]
-libcameraservice.so     0xA8000000 # [~1M]
-libhardware.so          0xA7F00000 # [<64K]
-libhardware_legacy.so   0xA7E00000 # [~1M]
-libapp_process.so       0xA7D00000 # [???]
-libsystem_server.so     0xA7C00000 # [~1M]
-libime.so               0xA7B00000 # [???]
-libjni_latinime.so      0xA7A00000 # [~1M]
-libdiskconfig.so        0xA7900000 # [<64K]
-libemoji.so             0xA7800000 # [<64K]
-libgps.so               0xA7700000 # [~1M]
-libcamera.so            0xA7600000 # [~1M]
-liboemcamera.so         0xA7400000 # [~2M]
-libjni_pinyinime.so     0xA7300000 # [~1M]
-libttssynthproxy.so     0xA7200000 # [~1M] for frameworks/base
-libttspico.so           0xA7000000 # [~2M] for external/svox
-
-# pv libraries
-libpvasf.so                    0xA6F00000 # [???]
-libpvasfreg.so                 0xA6E00000 # [???]
-libomx_sharedlibrary.so        0xA6D00000 # [~1M]
-libopencore_download.so        0xA6C00000 # [~1M]
-libopencore_downloadreg.so     0xA6B00000 # [~1M]
-libopencore_net_support.so     0xA6800000 # [~3M]
-libopencore_rtsp.so            0xA6200000 # [~6M]
-libopencore_rtspreg.so         0xA6100000 # [~1M]
-libopencore_author.so          0xA5D00000 # [~4M]
-libomx_aacdec_sharedlibrary.so 0xA5B00000 # [~2M]
-libomx_amrdec_sharedlibrary.so 0xA5A00000 # [~1M]
-libomx_amrenc_sharedlibrary.so 0xA5900000 # [~1M]
-libomx_avcdec_sharedlibrary.so 0xA5800000 # [~1M]
-libomx_avcenc_sharedlibrary.so 0xA5700000 # [???]
-libomx_m4vdec_sharedlibrary.so 0xA5600000 # [~1M]
-libomx_m4venc_sharedlibrary.so 0xA5500000 # [???]
-libomx_mp3dec_sharedlibrary.so 0xA5400000 # [~1M]
-libopencore_mp4local.so        0xA5200000 # [~2M]
-libopencore_mp4localreg.so     0xA5100000 # [~1M]
-libopencore_player.so          0xA4800000 # [~9M]
-
-# opencore hardware support
-libmm-adspsvc.so              0xA4700000 # [<64K]
-libOmxCore.so                 0xA4600000 # [<64K]
-libOmxMpeg4Dec.so             0xA4500000 # [~1M]
-libOmxH264Dec.so              0xA4400000 # [~1M]
-libOmxVidEnc.so               0xA4300000 # [~1M]
-libopencorehw.so              0xA4200000 # [~1M]
-libOmxVdec.so                 0xA4100000 # [~1M]
-libmm-omxcore.so              0xA4000000 # [<64K]
-
-# pv libraries
-libopencore_common.so         0xA3900000 # [~7M]
-libqcomm_omx.so               0xA3800000 # [<64K]
-
-# stagefright libraries
-libstagefright_amrnb_common.so     0xA3700000 # [~1M]
-libstagefright_avc_common.so       0xA3600000 # [~1M]
-libstagefright_color_conversion.so 0xA3500000 # [<64K]
-libstagefright_omx.so              0xA3400000 # [~1M]
-libstagefrighthw.so                0xA3300000 # [~1M]
-libstagefright.so                  0xA2F00000 # [~4M]
-
-# libraries for specific hardware
-libgsl.so               0xA2E00000 # [~1M]
-libhtc_acoustic.so      0xA2D00000 # [<64K]
-libhtc_ril.so           0xA2C00000 # [~1M]
-liblvmxipc.so           0xA2B00000 # [~1M] for vendor/nxp
-libreference-cdma-sms.so 0xA2A00000 # [<64K] for hardware/ril
-
-# libraries for specific apps or temporary libraries
-libcam_ipl.so           0x9F000000 # [???]
-libwbxml.so             0x9EF00000 # [???]
-libwbxml_jni.so         0x9EE00000 # [~1M]
-libxml2wbxml.so         0x9EB00000 # [~1M]
-libdrm1.so              0x9EA00000 # [~1M]
-libdrm1_jni.so          0x9E900000 # [<64K]
-libwapcore.so           0x9E800000 # [???]
-libstreetview.so        0x9E700000 # [???]
-libwapbrowsertest.so    0x9E600000 # [???]
-libminiglobe.so         0x9E500000 # [???]
-libearth.so             0x9E400000 # [???]
-libembunit.so           0x9E300000 # [<64K]
-libneon.so              0x9E200000 # [???]
-libjni_example.so       0x9E100000 # [???]
-libjni_load_test.so     0x9E000000 # [???]
-libjni_lib_test.so      0x9DF00000 # [???]
-librunperf.so           0x9DE00000 # [???]
-libctest.so             0x9DD00000 # [<64K]
-libUAPI_jni.so          0x9DC00000 # [???]
-librpc.so               0x9DB00000 # [~1M]
-libtrace_test.so        0x9DA00000 # [???]
-libsrec_jni.so          0x9D800000 # [~2M]
-libjpeg.so              0x9D700000 # [~1M]
-libiprouteutil.so       0x9D600000 # [~1M] for external/iproute2
-libnetlink.so           0x9D500000 # [<64K] for external/iproute2
-libpagemap.so           0x9D400000 # [<64K] for system/extras/libpagemap
-libstlport.so           0x9D100000 # [~3M] for external/stlport
-libzxing.so             0x9D000000 # [<64K] for goggles
-libinterstitial.so      0x9CF00000 # [<64K] for goggles
-liblept.so              0x9CA00000 # [~5M] for external/leptonica
diff --git a/products/AndroidProducts.mk b/products/AndroidProducts.mk
deleted file mode 100644
index b65bbbe..0000000
--- a/products/AndroidProducts.mk
+++ /dev/null
@@ -1,76 +0,0 @@
-PRODUCT_MAKEFILES := \
-    $(LOCAL_DIR)/cyanogen_ace.mk \
-    $(LOCAL_DIR)/cyanogen_anzu.mk \
-    $(LOCAL_DIR)/cyanogen_blade.mk \
-    $(LOCAL_DIR)/cyanogen_bravo.mk \
-    $(LOCAL_DIR)/cyanogen_bravoc.mk \
-    $(LOCAL_DIR)/cyanogen_buzz.mk \
-    $(LOCAL_DIR)/cyanogen_captivatemtd.mk \
-    $(LOCAL_DIR)/cyanogen_click.mk \
-    $(LOCAL_DIR)/cyanogen_coconut.mk \
-    $(LOCAL_DIR)/cyanogen_cooper.mk \
-    $(LOCAL_DIR)/cyanogen_crespo.mk \
-    $(LOCAL_DIR)/cyanogen_crespo4g.mk \
-    $(LOCAL_DIR)/cyanogen_desirec.mk \
-    $(LOCAL_DIR)/cyanogen_dream_sapphire.mk \
-    $(LOCAL_DIR)/cyanogen_droid2.mk \
-    $(LOCAL_DIR)/cyanogen_droid2we.mk \
-    $(LOCAL_DIR)/cyanogen_encore.mk \
-    $(LOCAL_DIR)/cyanogen_espresso.mk \
-    $(LOCAL_DIR)/cyanogen_es209ra.mk \
-    $(LOCAL_DIR)/cyanogen_fascinatemtd.mk \
-    $(LOCAL_DIR)/cyanogen_hallon.mk \
-    $(LOCAL_DIR)/cyanogen_hero.mk \
-    $(LOCAL_DIR)/cyanogen_heroc.mk \
-    $(LOCAL_DIR)/cyanogen_inc.mk \
-    $(LOCAL_DIR)/cyanogen_iyokan.mk \
-    $(LOCAL_DIR)/cyanogen_jordan.mk \
-    $(LOCAL_DIR)/cyanogen_galaxys2.mk \
-    $(LOCAL_DIR)/cyanogen_galaxys2att.mk \
-    $(LOCAL_DIR)/cyanogen_galaxysmtd.mk \
-    $(LOCAL_DIR)/cyanogen_generic.mk \
-    $(LOCAL_DIR)/cyanogen_glacier.mk \
-    $(LOCAL_DIR)/cyanogen_legend.mk \
-    $(LOCAL_DIR)/cyanogen_leo.mk \
-    $(LOCAL_DIR)/cyanogen_liberty.mk \
-    $(LOCAL_DIR)/cyanogen_mango.mk \
-    $(LOCAL_DIR)/cyanogen_mecha.mk \
-    $(LOCAL_DIR)/cyanogen_mesmerizemtd.mk \
-    $(LOCAL_DIR)/cyanogen_mimmi.mk \
-    $(LOCAL_DIR)/cyanogen_morrison.mk \
-    $(LOCAL_DIR)/cyanogen_motus.mk \
-    $(LOCAL_DIR)/cyanogen_one.mk \
-    $(LOCAL_DIR)/cyanogen_olympus.mk \
-    $(LOCAL_DIR)/cyanogen_p970.mk \
-    $(LOCAL_DIR)/cyanogen_p990.mk \
-    $(LOCAL_DIR)/cyanogen_p999.mk \
-    $(LOCAL_DIR)/cyanogen_passion.mk \
-    $(LOCAL_DIR)/cyanogen_robyn.mk \
-    $(LOCAL_DIR)/cyanogen_saga.mk \
-    $(LOCAL_DIR)/cyanogen_satsuma.mk \
-    $(LOCAL_DIR)/cyanogen_shadow.mk \
-    $(LOCAL_DIR)/cyanogen_shakira.mk \
-    $(LOCAL_DIR)/cyanogen_sholes.mk \
-    $(LOCAL_DIR)/cyanogen_showcasemtd.mk \
-    $(LOCAL_DIR)/cyanogen_smb_a1002.mk \
-    $(LOCAL_DIR)/cyanogen_smb_a1004.mk \
-    $(LOCAL_DIR)/cyanogen_smb_a1011.mk \
-    $(LOCAL_DIR)/cyanogen_smb_b9701.mk \
-    $(LOCAL_DIR)/cyanogen_smultron.mk \
-    $(LOCAL_DIR)/cyanogen_speedy.mk \
-    $(LOCAL_DIR)/cyanogen_supersonic.mk \
-    $(LOCAL_DIR)/cyanogen_tass.mk \
-    $(LOCAL_DIR)/cyanogen_u8150.mk \
-    $(LOCAL_DIR)/cyanogen_u8220.mk \
-    $(LOCAL_DIR)/cyanogen_urushi.mk \
-    $(LOCAL_DIR)/cyanogen_v9.mk \
-    $(LOCAL_DIR)/cyanogen_vega.mk \
-    $(LOCAL_DIR)/cyanogen_vibrantmtd.mk \
-    $(LOCAL_DIR)/cyanogen_vision.mk \
-    $(LOCAL_DIR)/cyanogen_vivo.mk \
-    $(LOCAL_DIR)/cyanogen_vivow.mk \
-    $(LOCAL_DIR)/cyanogen_z71.mk \
-    $(LOCAL_DIR)/cyanogen_zeppelin.mk \
-    $(LOCAL_DIR)/cyanogen_zero.mk \
-    $(LOCAL_DIR)/cyanogen_zeus.mk \
-    $(LOCAL_DIR)/cyanogen_zeusc.mk
diff --git a/products/bcm_fm_radio.mk b/products/bcm_fm_radio.mk
deleted file mode 100644
index 1e559e7..0000000
--- a/products/bcm_fm_radio.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-# Broadcom FM Radio
-PRODUCT_PACKAGES += \
-    FM \
-    hcitool
-
-PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/bcm_fm_radio
diff --git a/products/common.mk b/products/common.mk
deleted file mode 100644
index 195bc57..0000000
--- a/products/common.mk
+++ /dev/null
@@ -1,129 +0,0 @@
-# Generic cyanogenmod product
-PRODUCT_NAME := cyanogen
-PRODUCT_BRAND := cyanogen
-PRODUCT_DEVICE := generic
-
-PRODUCT_PACKAGES += ADWLauncher
-
-ifdef CYANOGEN_NIGHTLY
-PRODUCT_PROPERTY_OVERRIDES += \
-    ro.rommanager.developerid=cyanogenmodnightly
-else
-PRODUCT_PROPERTY_OVERRIDES += \
-    ro.rommanager.developerid=cyanogenmod
-endif
-
-PRODUCT_BUILD_PROP_OVERRIDES += BUILD_UTC_DATE=0
-
-# Used by BusyBox
-KERNEL_MODULES_DIR:=/system/lib/modules
-
-# Tiny toolbox
-TINY_TOOLBOX:=true
-
-PRODUCT_PROPERTY_OVERRIDES += \
-    ro.url.legal=http://www.google.com/intl/%s/mobile/android/basic/phone-legal.html \
-    ro.url.legal.android_privacy=http://www.google.com/intl/%s/mobile/android/basic/privacy.html \
-    ro.com.google.clientidbase=android-google \
-    ro.com.android.wifi-watchlist=GoogleGuest \
-    ro.setupwizard.enterprise_mode=1 \
-    ro.com.android.dateformat=MM-dd-yyyy \
-    ro.com.android.dataroaming=false
-
-# CyanogenMod specific product packages
-PRODUCT_PACKAGES += \
-    AndroidTerm \
-    FileManager \
-    CMParts \
-    CMStats \
-    CMUpdateNotify \
-    DSPManager \
-    libcyanogen-dsp \
-    Pacman \
-    screenshot \
-    CMScreenshot
-
-# Extra tools in CyanogenMod
-PRODUCT_PACKAGES += \
-    openvpn
-
-# Copy over the changelog to the device
-PRODUCT_COPY_FILES += \
-    vendor/cyanogen/CHANGELOG.mkdn:system/etc/CHANGELOG-CM.txt
-
-# Common CM overlay
-PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/common
-
-# T-Mobile theme engine
-include vendor/cyanogen/products/themes_common.mk
-
-PRODUCT_COPY_FILES += \
-    vendor/cyanogen/prebuilt/common/bin/backuptool.sh:system/bin/backuptool.sh \
-    vendor/cyanogen/prebuilt/common/bin/modelid_cfg.sh:system/bin/modelid_cfg.sh \
-    vendor/cyanogen/prebuilt/common/bin/verify_cache_partition_size.sh:system/bin/verify_cache_partition_size.sh \
-    vendor/cyanogen/prebuilt/common/etc/resolv.conf:system/etc/resolv.conf \
-    vendor/cyanogen/prebuilt/common/etc/sysctl.conf:system/etc/sysctl.conf \
-    vendor/cyanogen/prebuilt/common/etc/terminfo/l/linux:system/etc/terminfo/l/linux \
-    vendor/cyanogen/prebuilt/common/etc/terminfo/u/unknown:system/etc/terminfo/u/unknown \
-    vendor/cyanogen/prebuilt/common/etc/profile:system/etc/profile \
-    vendor/cyanogen/prebuilt/common/etc/init.local.rc:system/etc/init.local.rc \
-    vendor/cyanogen/prebuilt/common/etc/init.d/00banner:system/etc/init.d/00banner \
-    vendor/cyanogen/prebuilt/common/etc/init.d/01sysctl:system/etc/init.d/01sysctl \
-    vendor/cyanogen/prebuilt/common/etc/init.d/03firstboot:system/etc/init.d/03firstboot \
-    vendor/cyanogen/prebuilt/common/etc/init.d/04modules:system/etc/init.d/04modules \
-    vendor/cyanogen/prebuilt/common/etc/init.d/05mountsd:system/etc/init.d/05mountsd \
-    vendor/cyanogen/prebuilt/common/etc/init.d/06mountdl:system/etc/init.d/06mountdl \
-    vendor/cyanogen/prebuilt/common/etc/init.d/20userinit:system/etc/init.d/20userinit \
-    vendor/cyanogen/prebuilt/common/bin/handle_compcache:system/bin/handle_compcache \
-    vendor/cyanogen/prebuilt/common/bin/compcache:system/bin/compcache \
-    vendor/cyanogen/prebuilt/common/bin/fix_permissions:system/bin/fix_permissions \
-    vendor/cyanogen/prebuilt/common/bin/sysinit:system/bin/sysinit \
-    vendor/cyanogen/prebuilt/common/xbin/htop:system/xbin/htop \
-    vendor/cyanogen/prebuilt/common/xbin/irssi:system/xbin/irssi \
-    vendor/cyanogen/prebuilt/common/xbin/powertop:system/xbin/powertop \
-    vendor/cyanogen/prebuilt/common/xbin/openvpn-up.sh:system/xbin/openvpn-up.sh
-
-PRODUCT_COPY_FILES += \
-#    vendor/cyanogen/prebuilt/common/etc/init.d/10apps2sd:system/etc/init.d/10apps2sd
-
-PRODUCT_COPY_FILES +=  \
-    vendor/cyanogen/proprietary/RomManager.apk:system/app/RomManager.apk \
-
-# Enable SIP+VoIP on all targets
-PRODUCT_COPY_FILES += \
-    frameworks/base/data/etc/android.software.sip.voip.xml:system/etc/permissions/android.software.sip.voip.xml
-
-# Always run in insecure mode, enables root on user build variants
-#ADDITIONAL_DEFAULT_PROPERTIES += ro.secure=0
-
-ifdef CYANOGEN_WITH_GOOGLE
-
-    # use all present proprietary apk
-    PRODUCT_COPY_FILES += $(shell test -f vendor/cyanogen/proprietary/*.apk && \
-	find vendor/cyanogen/proprietary -name '*.apk' \
-	-printf '%p:system/app/%f ')
-
-    # use all present proprietary lib
-    PRODUCT_COPY_FILES += $(shell test -f vendor/cyanogen/proprietary/*.so && \
-	find vendor/cyanogen/proprietary -name '*.so' \
-	-printf '%p:system/lib/%f ')
-
-    # use all present proprietary jar
-    PRODUCT_COPY_FILES += $(shell test -f vendor/cyanogen/proprietary/*.jar && \
-	find vendor/cyanogen/proprietary -name '*.jar' \
-	-printf '%p:system/framework/%f ')
-
-    # use all present proprietary xml (permissions)
-    PRODUCT_COPY_FILES += $(shell test -f vendor/cyanogen/proprietary/*.xml && \
-	find vendor/cyanogen/proprietary -name '*.xml' \
-	-printf '%p:system/etc/permissions/%f ')
-
-else
-    PRODUCT_PACKAGES += \
-        Provision \
-        GoogleSearch
-endif
-
-# Required, keyboard
-PRODUCT_PACKAGES += LatinIME
-
diff --git a/products/common_full.mk b/products/common_full.mk
deleted file mode 100644
index d5fc4a2..0000000
--- a/products/common_full.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-# Inherit common CM stuff
-$(call inherit-product, vendor/cyanogen/products/common.mk)
-
-# CyanogenMod specific product packages
-PRODUCT_PACKAGES += \
-    CMWallpapers
-
-# Bring in all audio files
-include frameworks/base/data/sounds/AllAudio.mk
-
-# Theme packages
-include vendor/cyanogen/products/themes.mk
-
-# Include extra dictionaries for LatinIME
-PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/dictionaries
-
-# Default ringtone
-PRODUCT_PROPERTY_OVERRIDES += \
-    ro.config.ringtone=Playa.ogg \
-    ro.config.notification_sound=regulus.ogg \
-    ro.config.alarm_alert=Alarm_Beep_03.ogg
diff --git a/products/common_full_no_themes.mk b/products/common_full_no_themes.mk
deleted file mode 100644
index c45a069..0000000
--- a/products/common_full_no_themes.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# Inherit common CM stuff
-$(call inherit-product, vendor/cyanogen/products/common.mk)
-
-# CyanogenMod specific product packages
-PRODUCT_PACKAGES += \
-    CMWallpapers
-
-# Bring in all audio files
-include frameworks/base/data/sounds/AllAudio.mk
-
-# Include extra dictionaries for LatinIME
-PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/dictionaries
-
-# Default ringtone
-PRODUCT_PROPERTY_OVERRIDES += \
-    ro.config.ringtone=Playa.ogg \
-    ro.config.notification_sound=regulus.ogg \
-    ro.config.alarm_alert=Alarm_Beep_03.ogg
diff --git a/products/common_versions.mk b/products/common_versions.mk
deleted file mode 100644
index 20f88d1..0000000
--- a/products/common_versions.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-PRODUCT_VERSION_MAJOR = 9
-PRODUCT_VERSION_MINOR = 0
-PRODUCT_VERSION_MAINTENANCE = 0-RC0
-
-PRODUCT_BUILD_PROP_OVERRIDES += BUILD_DISPLAY_ID=ITL41D
-
-ifdef CYANOGEN_NIGHTLY
-    PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-$(PRODUCT_VERSION_MAJOR)-$(shell date +%m%d%Y)-NIGHTLY-$(PRODUCT_RELEASE_NAME)
-else
-    ifdef CYANOGEN_RELEASE
-        PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-$(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)$(PRODUCT_VERSION_DEVICE_SPECIFIC)-$(PRODUCT_RELEASE_NAME)
-    else
-        PRODUCT_PROPERTY_OVERRIDES += \
-            ro.modversion=CyanogenMod-$(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)$(PRODUCT_VERSION_DEVICE_SPECIFIC)-$(PRODUCT_RELEASE_NAME)-KANG
-    endif
-endif
-
diff --git a/products/cyanogen_ace.mk b/products/cyanogen_ace.mk
deleted file mode 100644
index 44b678e..0000000
--- a/products/cyanogen_ace.mk
+++ /dev/null
@@ -1,43 +0,0 @@
-# Inherit device configuration for ace.
-$(call inherit-product, device/htc/ace/ace.mk)
-
-# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common_full.mk)
-
-# Include GSM stuff
-$(call inherit-product, vendor/cyanogen/products/gsm.mk)
-
-#
-# Setup device specific product configuration.
-#
-PRODUCT_NAME := cyanogen_ace
-PRODUCT_BRAND := htc_wwe
-PRODUCT_DEVICE := ace
-PRODUCT_MODEL := Desire HD
-PRODUCT_MANUFACTURER := HTC
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=htc_ace BUILD_ID=GRI40 BUILD_FINGERPRINT=htc_wwe/htc_ace/ace:2.3.3/GRI40/87995:user/release-keys PRIVATE_BUILD_DESC="2.50.405.2 CL87995 release-keys"
-
-# Build kernel
-#PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=
-#PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_DIR=kernel-msm
-#PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_CONFIG=cyanogen_ace_defconfig
-
-# Extra Ace overlay
-PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/ace
-
-# Add the Torch app
-PRODUCT_PACKAGES += Torch
-
-# Broadcom FM radio
-$(call inherit-product, vendor/cyanogen/products/bcm_fm_radio.mk)
-
-# Release name and versioning
-PRODUCT_RELEASE_NAME := DesireHD
-PRODUCT_VERSION_DEVICE_SPECIFIC :=
--include vendor/cyanogen/products/common_versions.mk
-
-#
-# Copy passion specific prebuilt files
-#
-PRODUCT_COPY_FILES +=  \
-    vendor/cyanogen/prebuilt/hdpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/products/cyanogen_anzu.mk b/products/cyanogen_anzu.mk
deleted file mode 100644
index 23a51eb..0000000
--- a/products/cyanogen_anzu.mk
+++ /dev/null
@@ -1,44 +0,0 @@
-# Inherit device configuration for anzu.
-$(call inherit-product, device/semc/anzu/device_anzu.mk)
-
-# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common_full.mk)
-
-# Include GSM stuff
-$(call inherit-product, vendor/cyanogen/products/gsm.mk)
-
-#
-# Setup device specific product configuration.
-#
-PRODUCT_NAME := cyanogen_anzu
-PRODUCT_BRAND := SEMC
-PRODUCT_DEVICE := anzu
-PRODUCT_MODEL := LT15i
-PRODUCT_MANUFACTURER := Sony Ericsson
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=LT15i BUILD_ID=4.0.2.A.0.42 BUILD_FINGERPRINT=SEMC/LT15i_1247-1061/LT15i:2.3.4/4.0.2.A.0.42/bn_P:user/release-keys PRIVATE_BUILD_DESC="LT15i-user 2.3.4 4.0.3.A.0.42 bn_P test-keys"
-
-# Build kernel
-#PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=
-#PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_DIR=kernel-msm
-#PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_CONFIG=cyanogen_anzu_defconfig
-
-# Extra anzu overlay
-PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/anzu
-
-# Add the Torch app
-PRODUCT_PACKAGES += Torch
-
-
-# BCM FM radio
-#$(call inherit-product, vendor/cyanogen/products/bcm_fm_radio.mk)
-
-# Release name and versioning
-PRODUCT_RELEASE_NAME := XperiaArc-LT15i
-PRODUCT_VERSION_DEVICE_SPECIFIC :=
--include vendor/cyanogen/products/common_versions.mk
-
-#
-# Copy passion specific prebuilt files
-#
-PRODUCT_COPY_FILES +=  \
-    vendor/cyanogen/prebuilt/hdpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/products/cyanogen_blade.mk b/products/cyanogen_blade.mk
deleted file mode 100644
index 60dff49..0000000
--- a/products/cyanogen_blade.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-# Inherit AOSP device configuration for blade.
-$(call inherit-product, device/zte/blade/device_blade.mk)
-
-# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common_full.mk)
-
-# Include GSM stuff
-$(call inherit-product, vendor/cyanogen/products/gsm.mk)
-
-#
-# Setup device specific product configuration.
-#
-PRODUCT_NAME := cyanogen_blade
-PRODUCT_BRAND := zte
-PRODUCT_DEVICE := blade
-PRODUCT_MODEL := Blade
-PRODUCT_MANUFACTURER := ZTE
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=blade BUILD_ID=GRJ22 BUILD_FINGERPRINT=google/passion/passion:2.3.4/GRJ22/121341:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.3.4 GRJ22 121341 release-keys"
-
-# Release name and versioning
-PRODUCT_RELEASE_NAME := Blade
-PRODUCT_VERSION_DEVICE_SPECIFIC :=
--include vendor/cyanogen/products/common_versions.mk
-
-#
-# Copy legend specific prebuilt files
-#
-PRODUCT_COPY_FILES +=  \
-    vendor/cyanogen/prebuilt/hdpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/products/cyanogen_bravo.mk b/products/cyanogen_bravo.mk
deleted file mode 100644
index 42b05ab..0000000
--- a/products/cyanogen_bravo.mk
+++ /dev/null
@@ -1,49 +0,0 @@
-# Inherit AOSP device configuration for bravo.
-$(call inherit-product, device/htc/bravo/full_bravo.mk)
-
-# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common_full.mk)
-
-# Include GSM stuff
-$(call inherit-product, vendor/cyanogen/products/gsm.mk)
-
-#
-# Setup device specific product configuration.
-#
-PRODUCT_NAME := cyanogen_bravo
-PRODUCT_BRAND := htc_wwe
-PRODUCT_DEVICE := bravo
-PRODUCT_MODEL := HTC Desire
-PRODUCT_MANUFACTURER := HTC
-PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=GRI40 PRODUCT_NAME=htc_bravo BUILD_FINGERPRINT=htc_wwe/htc_bravo/bravo:2.3.3/GRI40/96875.1:user/release-keys TARGET_BUILD_TYPE=userdebug BUILD_VERSION_TAGS=release-keys PRIVATE_BUILD_DESC="3.14.405.1 CL96875 release-keys"
-
-# Build kernel
-PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=
-PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_DIR=kernel-msm
-PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_CONFIG=cyanogen_bravo_defconfig
-
-# Extra Bravo (CDMA/GSM) overlay
-PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/bravo
-
-# Add the Torch app
-PRODUCT_PACKAGES += Torch
-
-# Broadcom FM radio
-$(call inherit-product, vendor/cyanogen/products/bcm_fm_radio.mk)
-
-# Extra RIL settings
-PRODUCT_PROPERTY_OVERRIDES += \
-    ro.ril.enable.managed.roaming=1 \
-    ro.ril.oem.nosim.ecclist=911,112,113,115,117,999,000,08,118,120,122,110,119,995 \
-    ro.ril.emc.mode=2
-
-# Release name and versioning
-PRODUCT_RELEASE_NAME := Desire
-PRODUCT_VERSION_DEVICE_SPECIFIC :=
--include vendor/cyanogen/products/common_versions.mk
-
-#
-# Copy passion specific prebuilt files
-#
-PRODUCT_COPY_FILES +=  \
-    vendor/cyanogen/prebuilt/hdpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/products/cyanogen_bravoc.mk b/products/cyanogen_bravoc.mk
deleted file mode 100644
index a0259b2..0000000
--- a/products/cyanogen_bravoc.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-# Inherit AOSP device configuration for bravoc.
-$(call inherit-product, device/htc/bravoc/full_bravoc.mk)
-
-# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common_full.mk)
-
-#
-# Setup device specific product configuration.
-#
-PRODUCT_NAME := cyanogen_bravoc
-PRODUCT_BRAND := us_cellular_wwe
-PRODUCT_DEVICE := bravoc
-PRODUCT_MODEL := HTC Desire CDMA
-PRODUCT_MANUFACTURER := HTC
-PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=GRI40 PRODUCT_NAME=htc_bravo BUILD_FINGERPRINT=htc_wwe/htc_bravo/bravo:2.3.3/GRI40/96875.1:user/release-keys TARGET_BUILD_TYPE=userdebug BUILD_VERSION_TAGS=release-keys PRIVATE_BUILD_DESC="3.14.405.1 CL96875 release-keys"
-
-# Build kernel
-PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=
-PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_DIR=kernel-msm
-PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_CONFIG=cyanogen_bravoc_defconfig
-
-# Extra Bravo (CDMA/GSM) overlay
-PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/bravo
-
-# Add the Torch app
-PRODUCT_PACKAGES += Torch
-
-# Release name and versioning
-PRODUCT_RELEASE_NAME := BravoC
-PRODUCT_VERSION_DEVICE_SPECIFIC :=
--include vendor/cyanogen/products/common_versions.mk
-
-#
-# Copy passion specific prebuilt files
-#
-PRODUCT_COPY_FILES +=  \
-    vendor/cyanogen/prebuilt/hdpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/products/cyanogen_buzz.mk b/products/cyanogen_buzz.mk
deleted file mode 100644
index 876e6c2..0000000
--- a/products/cyanogen_buzz.mk
+++ /dev/null
@@ -1,41 +0,0 @@
-# Inherit AOSP device configuration for buzz.
-$(call inherit-product, device/htc/buzz/buzz.mk)
-
-# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common_full_no_themes.mk)
-
-# Include GSM stuff
-$(call inherit-product, vendor/cyanogen/products/gsm.mk)
-
-#
-# Setup device specific product configuration.
-#
-PRODUCT_NAME := cyanogen_buzz
-PRODUCT_BRAND := htc_wwe
-PRODUCT_DEVICE := buzz
-PRODUCT_MODEL := HTC Wildfire
-PRODUCT_MANUFACTURER := HTC
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=htc_buzz BUILD_ID=GRI40 BUILD_FINGERPRINT=google/passion/passion:2.3.3/GRI40/102588:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.3.3 GRI40 102588 release-keys"
-
-PRODUCT_SPECIFIC_DEFINES += TARGET_PRELINKER_MAP=$(TOP)/vendor/cyanogen/prelink-linux-arm-msm722x.map
-
-# Add LDPI assets, in addition to MDPI
-PRODUCT_LOCALES += ldpi mdpi
-
-# Extra overlay for LDPI
-PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/ldpi
-
-# Broadcom FM radio
-$(call inherit-product, vendor/cyanogen/products/bcm_fm_radio.mk)
-
-# Add the Torch app
-PRODUCT_PACKAGES += Torch
-
-# Copy bootanimation
-PRODUCT_COPY_FILES +=  \
-    vendor/cyanogen/prebuilt/ldpi/media/bootanimation.zip:system/media/bootanimation.zip
-
-# Release name and versioning
-PRODUCT_RELEASE_NAME := buzz
-PRODUCT_VERSION_DEVICE_SPECIFIC :=
--include vendor/cyanogen/products/common_versions.mk
diff --git a/products/cyanogen_captivatemtd.mk b/products/cyanogen_captivatemtd.mk
deleted file mode 100644
index ca02263..0000000
--- a/products/cyanogen_captivatemtd.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-# Inherit AOSP device configuration for captivate.
-$(call inherit-product, device/samsung/captivatemtd/full_captivatemtd.mk)
-
-# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common_full.mk)
-
-# Include GSM stuff
-$(call inherit-product, vendor/cyanogen/products/gsm.mk)
-
-#
-# Setup device specific product configuration.
-#
-PRODUCT_NAME := cyanogen_captivatemtd
-PRODUCT_BRAND := samsung
-PRODUCT_DEVICE := captivatemtd
-PRODUCT_MODEL := SGH-I897
-PRODUCT_MANUFACTURER := samsung
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=SGH-I897 BUILD_ID=GINGERBREAD BUILD_FINGERPRINT=samsung/SGH-I897/SGH-I897:2.3.5/GINGERBREAD/UCKJ3:user/release-keys PRIVATE_BUILD_DESC="SGH-I897-user 2.3.5 GINGERBREAD UCKJ3 release-keys"
-
-# Build kernel
-#PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=
-#PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_DIR=kernel-samsung
-#PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_CONFIG=cyanogen_captivate_defconfig
-
-# Extra captivate overlay
-PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/captivatemtd
-
-# Extra RIL settings
-PRODUCT_PROPERTY_OVERRIDES += \
-    ro.ril.enable.managed.roaming=1 \
-    ro.ril.oem.nosim.ecclist=911,112,999,000,08,118,120,122,110,119,995 \
-    ro.ril.emc.mode=2
-
-# Add additional mounts
-PRODUCT_PROPERTY_OVERRIDES += \
-    ro.additionalmounts=/mnt/emmc \
-    ro.vold.switchablepair=/mnt/sdcard,/mnt/emmc
-
-# Release name and versioning
-PRODUCT_RELEASE_NAME := Captivate
-PRODUCT_VERSION_DEVICE_SPECIFIC :=
--include vendor/cyanogen/products/common_versions.mk
-
-#
-# Copy captivate specific prebuilt files
-#
-PRODUCT_COPY_FILES +=  \
-    vendor/cyanogen/prebuilt/hdpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/products/cyanogen_click.mk b/products/cyanogen_click.mk
deleted file mode 100644
index bdcde71..0000000
--- a/products/cyanogen_click.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-# Inherit AOSP device configuration for click.
-$(call inherit-product, device/htc/click/click.mk)
-
-# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common_full_no_themes.mk)
-
-# Include GSM stuff
-$(call inherit-product, vendor/cyanogen/products/gsm.mk)
-
-# Broadcom FM radio
-$(call inherit-product, vendor/cyanogen/products/ti_fm_radio.mk)
-
-# Build kernel
-PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=device/htc/click/kernel
-
-#
-# Setup device specific product configuration.
-#
-PRODUCT_NAME := cyanogen_click
-PRODUCT_BRAND := htc_wwe
-PRODUCT_DEVICE := click
-PRODUCT_MODEL := HTC Tattoo
-PRODUCT_MANUFACTURER := HTC
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=htc_click BUILD_ID=GRI40 BUILD_FINGERPRINT=google/passion/passion:2.3.3/GRI40/102588:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.3.3 GRI40 102588 release-keys"
-
-# Add LDPI assets, in addition to MDPI
-PRODUCT_LOCALES += ldpi mdpi
-
-# Extra Passion overlay
-PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/ldpi
-
-# Boot animation
-PRODUCT_COPY_FILES +=  \
-    vendor/cyanogen/prebuilt/ldpi/media/bootanimation.zip:system/media/bootanimation.zip
-
-# Release name and versioning
-PRODUCT_RELEASE_NAME := click
-PRODUCT_VERSION_DEVICE_SPECIFIC :=
--include vendor/cyanogen/products/common_versions.mk
diff --git a/products/cyanogen_coconut.mk b/products/cyanogen_coconut.mk
deleted file mode 100644
index 4a66ae4..0000000
--- a/products/cyanogen_coconut.mk
+++ /dev/null
@@ -1,43 +0,0 @@
-# Inherit device configuration for coconut.
-$(call inherit-product, device/semc/coconut/device_coconut.mk)
-
-# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common_full.mk)
-
-# Include GSM stuff
-$(call inherit-product, vendor/cyanogen/products/gsm.mk)
-
-#
-# Setup device specific product configuration.
-#
-PRODUCT_NAME := cyanogen_coconut
-PRODUCT_BRAND := SEMC
-PRODUCT_DEVICE := coconut
-PRODUCT_MODEL := WT19i
-PRODUCT_MANUFACTURER := Sony Ericsson
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=WT19i BUILD_ID=4.0.2.A.0.42 BUILD_FINGERPRINT=SEMC/WT19i_1249-6227/WT19i:2.3.4/4.0.2.A.0.42/j_b_3w:user/release-keys PRIVATE_BUILD_DESC="WT19i-user 2.3.4 4.0.2.A.0.42 j_b_3w test-keys"
-
-# Build kernel
-#PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=
-#PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_DIR=kernel-msm
-#PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_CONFIG=cyanogen_coconut_defconfig
-
-# Extra coconut overlay
-PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/coconut
-
-# Add the Torch app
-PRODUCT_PACKAGES += Torch
-
-# BCM FM radio
-#$(call inherit-product, vendor/cyanogen/products/bcm_fm_radio.mk)
-
-# Release name and versioning
-PRODUCT_RELEASE_NAME := LiveWithWalkman-WT19i
-PRODUCT_VERSION_DEVICE_SPECIFIC :=
--include vendor/cyanogen/products/common_versions.mk
-
-#
-# Copy passion specific prebuilt files
-#
-PRODUCT_COPY_FILES +=  \
-    vendor/cyanogen/prebuilt/mdpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/products/cyanogen_cooper.mk b/products/cyanogen_cooper.mk
deleted file mode 100644
index 1537d0b..0000000
--- a/products/cyanogen_cooper.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-# Inherit AOSP device configuration for blade.
-$(call inherit-product, device/samsung/cooper/device_cooper.mk)
-
-# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common_full.mk)
-
-# Include GSM stuff
-$(call inherit-product, vendor/cyanogen/products/gsm.mk)
-
-#
-# Setup device specific product configuration.
-#
-PRODUCT_NAME := cyanogen_cooper
-PRODUCT_BRAND := samsung
-PRODUCT_DEVICE := cooper
-PRODUCT_MODEL := GT-S5830
-PRODUCT_MANUFACTURER := Samsung
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=cooper BUILD_ID=GRWK74 BUILD_FINGERPRINT=samsung/GT-S5830/GT-S5830:2.3.4/GINGERBREAD/XXKPH:user/test-keys PRIVATE_BUILD_DESC="GT-S5830-user 2.3.4 GINGERBREAD XXKPH test-keys"
-
-# Release name and versioning
-PRODUCT_RELEASE_NAME := GalaxyAce
-PRODUCT_VERSION_DEVICE_SPECIFIC :=
--include vendor/cyanogen/products/common_versions.mk
-
-#
-# Copy legend specific prebuilt files
-#
-PRODUCT_COPY_FILES +=  \
-    vendor/cyanogen/prebuilt/mdpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/products/cyanogen_crespo.mk b/products/cyanogen_crespo.mk
deleted file mode 100644
index e2af224..0000000
--- a/products/cyanogen_crespo.mk
+++ /dev/null
@@ -1,41 +0,0 @@
-# Inherit AOSP device configuration for crespo.
-$(call inherit-product, device/samsung/crespo/full_crespo.mk)
-
-# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common_full.mk)
-
-# Include GSM stuff
-$(call inherit-product, vendor/cyanogen/products/gsm.mk)
-
-#
-# Setup device specific product configuration.
-#
-PRODUCT_NAME := cyanogen_crespo
-PRODUCT_BRAND := google
-PRODUCT_DEVICE := crespo
-PRODUCT_MODEL := Nexus S
-PRODUCT_MANUFACTURER := samsung
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=soju BUILD_ID=GWK74 BUILD_FINGERPRINT=google/soju/crespo:2.3.7/GWK74/185293:user/release-keys PRIVATE_BUILD_DESC="soju-user 2.3.7 GWK74 185293 release-keys" BUILD_NUMBER=185293
-
-# Extra Crespo overlay
-PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/crespo
-
-# Add the Torch app
-PRODUCT_PACKAGES += Torch
-
-# Extra RIL settings
-PRODUCT_PROPERTY_OVERRIDES += \
-    ro.ril.enable.managed.roaming=1 \
-    ro.ril.oem.nosim.ecclist=911,112,999,000,08,118,120,122,110,119,995 \
-    ro.ril.emc.mode=2
-
-# Release name and versioning
-PRODUCT_RELEASE_NAME := NS
-PRODUCT_VERSION_DEVICE_SPECIFIC :=
--include vendor/cyanogen/products/common_versions.mk
-
-#
-# Copy crespo specific prebuilt files
-#
-PRODUCT_COPY_FILES +=  \
-    vendor/cyanogen/prebuilt/hdpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/products/cyanogen_crespo4g.mk b/products/cyanogen_crespo4g.mk
deleted file mode 100644
index d85dcc6..0000000
--- a/products/cyanogen_crespo4g.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-# Inherit AOSP device configuration for crespo.
-$(call inherit-product, device/samsung/crespo4g/full_crespo4g.mk)
-
-# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common_full.mk)
-
-#
-# Setup device specific product configuration.
-#
-PRODUCT_NAME := cyanogen_crespo4g
-PRODUCT_BRAND := google
-PRODUCT_DEVICE := crespo4g
-PRODUCT_MODEL := Nexus S 4G
-PRODUCT_MANUFACTURER := samsung
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=sojus BUILD_ID=GWK74 BUILD_FINGERPRINT=google/sojus/crespo4g:2.3.7/GWK74/185293:user/release-keys PRIVATE_BUILD_DESC="sojus-user 2.3.7 GWK74 185293 release-keys" BUILD_NUMBER=185293
-
-# Extra Crespo overlay
-PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/crespo4g
-
-# Add the Torch app
-PRODUCT_PACKAGES += Torch
-
-# Release name and versioning
-PRODUCT_RELEASE_NAME := NS4G
-PRODUCT_VERSION_DEVICE_SPECIFIC :=
--include vendor/cyanogen/products/common_versions.mk
-
-#
-# Copy crespo specific prebuilt files
-#
-PRODUCT_COPY_FILES +=  \
-    vendor/cyanogen/prebuilt/hdpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/products/cyanogen_desirec.mk b/products/cyanogen_desirec.mk
deleted file mode 100644
index 9844e92..0000000
--- a/products/cyanogen_desirec.mk
+++ /dev/null
@@ -1,38 +0,0 @@
-# Inherit AOSP device configuration for desirec.
-$(call inherit-product, device/htc/desirec/device_desirec.mk)
-
-# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common_full.mk)
-
-# Inherit apns list from common
-$(call inherit-product, vendor/cyanogen/products/gsm.mk)
-
-#
-# Setup device specific product configuration.
-#
-PRODUCT_NAME := cyanogen_desirec
-PRODUCT_BRAND := verizon
-PRODUCT_DEVICE := desirec
-PRODUCT_MODEL := ERIS
-PRODUCT_MANUFACTURER := HTC
-PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=GRI40 BUILD_FINGERPRINT=google/passion/passion:2.3.3/GRI40/102588:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.3.3 GRI40 102588 release-keys"
-
-# Use Prebuilt kernel from desirec device tree
-PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=device/htc/desirec/kernel
-
-# Extra overlay for Gallery3D orientation hack
-PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/heroc
-
-# Enable Windows Media
-WITH_WINDOWS_MEDIA := true
-
-# Release name and versioning
-PRODUCT_RELEASE_NAME := Eris
-PRODUCT_VERSION_DEVICE_SPECIFIC :=
--include vendor/cyanogen/products/common_versions.mk
-
-#
-# Copy dream/sapphire specific prebuilt files
-#
-PRODUCT_COPY_FILES +=  \
-    vendor/cyanogen/prebuilt/mdpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/products/cyanogen_dream_sapphire.mk b/products/cyanogen_dream_sapphire.mk
deleted file mode 100644
index 1c878c1..0000000
--- a/products/cyanogen_dream_sapphire.mk
+++ /dev/null
@@ -1,53 +0,0 @@
-# Inherit AOSP device configuration for dream_sapphire.
-$(call inherit-product, device/htc/dream_sapphire/full_dream_sapphire.mk)
-
-# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common.mk)
-
-# Include GSM-only stuff
-$(call inherit-product, vendor/cyanogen/products/gsm.mk)
-
-#
-# Setup device specific product configuration.
-#
-PRODUCT_NAME := cyanogen_dream_sapphire
-PRODUCT_BRAND := google
-PRODUCT_DEVICE := dream_sapphire
-PRODUCT_MODEL := Dream/Sapphire
-PRODUCT_MANUFACTURER := HTC
-PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=FRG83 BUILD_FINGERPRINT=tmobile/opal/sapphire/sapphire:2.2.1/FRG83/60505:user/release-keys PRIVATE_BUILD_DESC="opal-user 2.2.1 FRG83 60505 release-keys"
-
-# Build kernel
-#PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=
-#PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_DIR=kernel-msm
-#PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_CONFIG=cyanogen_msm_defconfig
-
-# Extra DS overlay
-PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/dream_sapphire
-
-# Add the CMWallpapers app
-PRODUCT_PACKAGES += CMWallpapers
-
-# This file is used to install the correct audio profile when booted
-PRODUCT_COPY_FILES += \
-    vendor/cyanogen/prebuilt/dream_sapphire/etc/init.d/02audio_profile:system/etc/init.d/02audio_profile
-
-# Enable Compcache by default on D/S
-PRODUCT_PROPERTY_OVERRIDES += \
-    ro.compcache.default=18
-
-# Release name and versioning
-PRODUCT_RELEASE_NAME := DS
-PRODUCT_VERSION_DEVICE_SPECIFIC :=
--include vendor/cyanogen/products/common_versions.mk
-
-# Use the audio profile hack
-WITH_DS_HTCACOUSTIC_HACK := true
-
-#
-# Copy DS specific prebuilt files
-#
-PRODUCT_COPY_FILES +=  \
-    vendor/cyanogen/prebuilt/mdpi/media/bootanimation.zip:system/media/bootanimation.zip \
-    vendor/cyanogen/prebuilt/dream_sapphire/etc/AudioPara_dream.csv:system/etc/AudioPara_dream.csv \
-    vendor/cyanogen/prebuilt/dream_sapphire/etc/AudioPara_sapphire.csv:system/etc/AudioPara_sapphire.csv
diff --git a/products/cyanogen_droid2.mk b/products/cyanogen_droid2.mk
deleted file mode 100644
index 30d03fe..0000000
--- a/products/cyanogen_droid2.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-# Inherit AOSP device configuration for passion.
-$(call inherit-product, device/motorola/droid2/droid2.mk)
-
-# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common_full.mk)
-
-#
-# Setup device specific product configuration.
-#
-PRODUCT_NAME := cyanogen_droid2
-PRODUCT_BRAND := motorola
-PRODUCT_DEVICE := droid2
-PRODUCT_MODEL := DROID2
-PRODUCT_MANUFACTURER := Motorola
-
-# Release name and versioning
-PRODUCT_RELEASE_NAME := DROID2
-PRODUCT_VERSION_DEVICE_SPECIFIC :=
--include vendor/cyanogen/products/common_versions.mk
-
-PRODUCT_BUILD_PROP_OVERRIDES := BUILD_ID=VZW PRODUCT_NAME=droid2_vzw TARGET_DEVICE=cdma_droid2 BUILD_FINGERPRINT=verizon/droid2_vzw/cdma_droid2/droid2:2.2/VZW/23.20:user/ota-rel-keys,release-keys PRODUCT_BRAND=verizon PRIVATE_BUILD_DESC="cdma_droid2-user 2.2 VZW 2.3.20 ota-rel-keys,release-keys" BUILD_NUMBER=2.3.20 BUILD_UTC_DATE=1284778494 TARGET_BUILD_TYPE=user BUILD_VERSION_TAGS=release-keys USER=dbretzm1
-
-PRODUCT_COPY_FILES +=  \
-    vendor/cyanogen/prebuilt/hdpi/media/bootanimation.zip:system/media/bootanimation.zip
-
-PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/droid2
-
-# Add the Torch app
-PRODUCT_PACKAGES += Torch
diff --git a/products/cyanogen_droid2we.mk b/products/cyanogen_droid2we.mk
deleted file mode 100644
index 56171f7..0000000
--- a/products/cyanogen_droid2we.mk
+++ /dev/null
@@ -1,46 +0,0 @@
-# Inherit device configuration for Droid2WE.
-$(call inherit-product, device/motorola/droid2we/droid2we.mk)
-
-# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common_full.mk)
-
-# Include GSM stuff
-#$(call inherit-product, vendor/cyanogen/products/gsm.mk)
-
-#
-# Setup device specific product configuration.
-#
-PRODUCT_NAME := cyanogen_droid2we
-PRODUCT_BRAND := motorola
-PRODUCT_DEVICE := droid2we
-PRODUCT_MODEL := DROID2 GLOBAL
-PRODUCT_MANUFACTURER := Motorola
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=droid2we_vzw BUILD_ID=S273 BUILD_FINGERPRINT=verizon/droid2we_vzw/cdma_droid2we/droid2we:2.2/S273/2.4.330:user/ota-rel-keys,release-keys PRIVATE_BUILD_DESC="cdma_droid2we-user 2.2 S273 2.4.330 ota-rel-keys,release-keys" TARGET_DEVICE=cdma_droid2we PRODUCT_BRAND=verizon BUILD_NUMBER=2.4.330 BUILD_UTC_DATE=1287722464 TARGET_BUILD_TYPE=user BUILD_VERSION_TAGS=release-keys USER=xrpk47
-
-# Build kernel
-#PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=
-#PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_DIR=kernel-msm
-#PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_CONFIG=cyanogen_droid2we_defconfig
-
-# Extra Droid2WE overlay
-PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/droid2we
-
-# Add the Torch app
-PRODUCT_PACKAGES += Torch
-
-# Build GanOptimizer
-#PRODUCT_PACKAGES += GanOptimizer
-
-# Broadcom FM radio
-#$(call inherit-product, vendor/cyanogen/products/bcm_fm_radio.mk)
-
-# Release name and versioning
-PRODUCT_RELEASE_NAME := DROID2WE
-PRODUCT_VERSION_DEVICE_SPECIFIC :=
--include vendor/cyanogen/products/common_versions.mk
-
-#
-# Copy Droid2WE specific prebuilt files
-#
-PRODUCT_COPY_FILES +=  \
-    vendor/cyanogen/prebuilt/hdpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/products/cyanogen_encore.mk b/products/cyanogen_encore.mk
deleted file mode 100644
index 19eefbf..0000000
--- a/products/cyanogen_encore.mk
+++ /dev/null
@@ -1,28 +0,0 @@
-# Inherit AOSP device configuration for encore.
-$(call inherit-product, device/bn/encore/encore.mk)
-
-# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common_full.mk)
-
-#
-# Setup device specific product configuration.
-#
-PRODUCT_NAME := cyanogen_encore
-PRODUCT_BRAND := bn
-PRODUCT_DEVICE := encore
-PRODUCT_MODEL := NookColor
-PRODUCT_MANUFACTURER := bn
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=encore BUILD_ID=GRK39F BUILD_FINGERPRINT=google/passion/passion:2.3.6/GRK39F/189904:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.3.6 GRK39F 189904 release-keys"
-
-PRODUCT_PACKAGE_OVERLAYS += \
-    vendor/cyanogen/overlay/tablet \
-    vendor/cyanogen/overlay/encore
-
-# Release name and versioning
-PRODUCT_RELEASE_NAME := encore
-PRODUCT_VERSION_DEVICE_SPECIFIC :=
--include vendor/cyanogen/products/common_versions.mk
-
-PRODUCT_COPY_FILES +=  \
-    vendor/cyanogen/prebuilt/hdpi/media/bootanimation.zip:system/media/bootanimation.zip
-
diff --git a/products/cyanogen_es209ra.mk b/products/cyanogen_es209ra.mk
deleted file mode 100644
index ed2bb2c..0000000
--- a/products/cyanogen_es209ra.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-# Inherit device configuration for es209ra.
-$(call inherit-product, device/semc/es209ra/device_es209ra.mk)
-
-# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common_full.mk)
-
-# Include GSM stuff
-$(call inherit-product, vendor/cyanogen/products/gsm.mk)
-
-#
-# Setup device specific product configuration.
-#
-PRODUCT_NAME := cyanogen_es209ra
-PRODUCT_BRAND := SEMC
-PRODUCT_DEVICE := es209ra
-PRODUCT_MODEL := X10i
-PRODUCT_MANUFACTURER := Sony Ericsson
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=X10i BUILD_ID=3.0.1.G.0.75 BUILD_FINGERPRINT=SEMC/X10i_1241-1846/X10i:2.3.3/3.0.1.G.0.75/tB_P:user/release-keys PRIVATE_BUILD_DESC="X10i-user 2.3.3 3.0.1.G.0.75 tB_P test-keys"
-
-# Add the Torch app
-PRODUCT_PACKAGES += Torch
-
-# Release name and versioning
-PRODUCT_RELEASE_NAME := es209ra
-PRODUCT_VERSION_DEVICE_SPECIFIC :=
--include vendor/cyanogen/products/common_versions.mk
-
-#
-# Copy passion specific prebuilt files
-#
-PRODUCT_COPY_FILES +=  \
-    vendor/cyanogen/prebuilt/hdpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/products/cyanogen_espresso.mk b/products/cyanogen_espresso.mk
deleted file mode 100644
index 733e4b9..0000000
--- a/products/cyanogen_espresso.mk
+++ /dev/null
@@ -1,40 +0,0 @@
-# Inherit AOSP device configuration for espresso.
-$(call inherit-product, device/htc/espresso/espresso.mk)
-
-# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common_full.mk)
-
-# Include GSM stuff
-$(call inherit-product, vendor/cyanogen/products/gsm.mk)
-
-#
-# Setup device specific product configuration.
-#
-PRODUCT_NAME := cyanogen_espresso
-PRODUCT_BRAND := tmobile
-PRODUCT_DEVICE := espresso
-PRODUCT_MODEL := T-Mobile myTouch 3G Slide
-PRODUCT_MANUFACTURER := HTC
-PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=GRI40 PRODUCT_NAME=htc_espresso BUILD_FINGERPRINT=google/passion/passion:2.3.3/GRI40/102588:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.3.3 GRI40 102588 release-keys"
-
-PRODUCT_SPECIFIC_DEFINES += TARGET_PRELINKER_MAP=$(TOP)/vendor/cyanogen/prelink-linux-arm-msm722x.map
-
-# Extra Espresso overlay
-PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/espresso
-
-# Add the Torch app
-PRODUCT_PACKAGES += Torch
-
-# Build GanOptimizer
-PRODUCT_PACKAGES += GanOptimizer
-
-# Release name and versioning
-PRODUCT_RELEASE_NAME := Slide
-PRODUCT_VERSION_DEVICE_SPECIFIC :=
--include vendor/cyanogen/products/common_versions.mk
-
-#
-# Copy espresso specific prebuilt files
-#
-PRODUCT_COPY_FILES +=  \
-    vendor/cyanogen/prebuilt/mdpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/products/cyanogen_fascinatemtd.mk b/products/cyanogen_fascinatemtd.mk
deleted file mode 100644
index 5f03f85..0000000
--- a/products/cyanogen_fascinatemtd.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-# Inherit AOSP device configuration for fascinatemtd.
-$(call inherit-product, device/samsung/fascinatemtd/full_fascinatemtd.mk)
-
-# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common_full.mk)
-
-#
-# Setup device specific product configuration.
-#
-PRODUCT_NAME := cyanogen_fascinatemtd
-PRODUCT_BRAND := samsung
-PRODUCT_DEVICE := fascinatemtd
-PRODUCT_MODEL := SCH-I500
-PRODUCT_MANUFACTURER := samsung
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=SCH-I500 BUILD_ID=GINGERBREAD BUILD_FINGERPRINT=uscc/SCH-I500/SCH-I500:2.3.4/GINGERBREAD/EH09:user/release-keys PRIVATE_BUILD_DESC="SCH-I500-user 2.3.4 GINGERBREAD EH09 release-keys"
-
-# Extra fascinatemtd overlay
-PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/fascinatemtd
-
-# Add the Torch app
-PRODUCT_PACKAGES += Torch
-
-# Release name and versioning
-PRODUCT_RELEASE_NAME := Fascinate
-PRODUCT_VERSION_DEVICE_SPECIFIC :=
--include vendor/cyanogen/products/common_versions.mk
-
-#
-# Copy galaxys specific prebuilt files
-#
-PRODUCT_COPY_FILES +=  \
-    vendor/cyanogen/prebuilt/hdpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/products/cyanogen_galaxys2.mk b/products/cyanogen_galaxys2.mk
deleted file mode 100644
index 79de694..0000000
--- a/products/cyanogen_galaxys2.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-# Inherit AOSP device configuration for galaxys2.
-$(call inherit-product, device/samsung/galaxys2/full_galaxys2.mk)
-
-# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common_full.mk)
-
-# Include GSM stuff
-$(call inherit-product, vendor/cyanogen/products/gsm.mk)
-
-#
-# Setup device specific product configuration.
-#
-PRODUCT_NAME := cyanogen_galaxys2
-PRODUCT_BRAND := samsung
-PRODUCT_DEVICE := galaxys2
-PRODUCT_MODEL := GT-I9100
-PRODUCT_MANUFACTURER := samsung
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=GT-I9100 BUILD_ID=GRJ22 BUILD_FINGERPRINT=samsung/GT-I9100/GT-I9100:2.3.4/GINGERBREAD/XXKG2:user/release-keys PRIVATE_BUILD_DESC="GT-I9100-user 2.3.4 GINGERBREAD XXKG2 release-keys"
-
-# Extra captivate overlay
-PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/galaxys2
-
-# Add FM and Torch Apps
-PRODUCT_PACKAGES += \
-    Torch \
-    FM
-
-# Extra RIL settings
-PRODUCT_PROPERTY_OVERRIDES += \
-    ro.ril.enable.managed.roaming=1 \
-    ro.ril.oem.nosim.ecclist=911,112,999,000,08,118,120,122,110,119,995 \
-    ro.ril.emc.mode=2
-
-# Add additional mounts
-PRODUCT_PROPERTY_OVERRIDES += \
-    ro.additionalmounts=/mnt/emmc;/mnt/usbdisk \
-    ro.vold.switchablepair=/mnt/sdcard,/mnt/emmc
-
-# Release name and versioning
-PRODUCT_RELEASE_NAME := GalaxyS2
-PRODUCT_VERSION_DEVICE_SPECIFIC :=
--include vendor/cyanogen/products/common_versions.mk
-
-#
-# Copy captivate specific prebuilt files
-#
-PRODUCT_COPY_FILES +=  \
-    vendor/cyanogen/prebuilt/hdpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/products/cyanogen_galaxys2att.mk b/products/cyanogen_galaxys2att.mk
deleted file mode 100644
index c40c038..0000000
--- a/products/cyanogen_galaxys2att.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-# Inherit AOSP device configuration for galaxys2att.
-$(call inherit-product, device/samsung/galaxys2att/full_galaxys2att.mk)
-
-# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common_full.mk)
-
-# Include GSM stuff
-$(call inherit-product, vendor/cyanogen/products/gsm.mk)
-
-#
-# Setup device specific product configuration.
-#
-PRODUCT_NAME := cyanogen_galaxys2att
-PRODUCT_BRAND := samsung
-PRODUCT_DEVICE := galaxys2att
-PRODUCT_MODEL := SGH-I777
-PRODUCT_MANUFACTURER := samsung
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=SGH-I777 BUILD_ID=GWK74 BUILD_FINGERPRINT=samsung/SGH-I777/SGH-I777:2.3.7/GINGERBREAD/UCKH7:user/release-keys PRIVATE_BUILD_DESC="SGH-I777-user 2.3.7 GINGERBREAD UCKH7 release-keys"
-
-# Extra captivate overlay
-PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/galaxys2att
-
-# Add FM and Torch Apps
-PRODUCT_PACKAGES += \
-    Torch \
-    FM
-
-# Extra RIL settings
-PRODUCT_PROPERTY_OVERRIDES += \
-    ro.ril.enable.managed.roaming=1 \
-    ro.ril.oem.nosim.ecclist=911,112,999,000,08,118,120,122,110,119,995 \
-    ro.ril.emc.mode=2
-
-# Add additional mounts
-PRODUCT_PROPERTY_OVERRIDES += \
-    ro.additionalmounts=/mnt/emmc;/mnt/usbdisk \
-    ro.vold.switchablepair=/mnt/sdcard,/mnt/emmc
-
-# Release name and versioning
-PRODUCT_RELEASE_NAME := Galaxys2ATT
-PRODUCT_VERSION_DEVICE_SPECIFIC :=
--include vendor/cyanogen/products/common_versions.mk
-
-#
-# Copy captivate specific prebuilt files
-#
-PRODUCT_COPY_FILES +=  \
-    vendor/cyanogen/prebuilt/hdpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/products/cyanogen_galaxysmtd.mk b/products/cyanogen_galaxysmtd.mk
deleted file mode 100644
index a4afc7b..0000000
--- a/products/cyanogen_galaxysmtd.mk
+++ /dev/null
@@ -1,51 +0,0 @@
-# Inherit AOSP device configuration for galaxys.
-$(call inherit-product, device/samsung/galaxysmtd/full_galaxysmtd.mk)
-
-# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common_full.mk)
-
-# Include GSM stuff
-$(call inherit-product, vendor/cyanogen/products/gsm.mk)
-
-#
-# Setup device specific product configuration.
-#
-PRODUCT_NAME := cyanogen_galaxysmtd
-PRODUCT_BRAND := samsung
-PRODUCT_DEVICE := galaxysmtd
-PRODUCT_MODEL := GT-I9000
-PRODUCT_MANUFACTURER := samsung
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=GT-I9000 BUILD_ID=GINGERBREAD BUILD_FINGERPRINT=samsung/GT-I9000/GT-I9000:2.3.5/GINGERBREAD/XXJVT:user/release-keys PRIVATE_BUILD_DESC="GT-I9000-user 2.3.5 GINGERBREAD XXJVT release-keys"
-
-# Build kernel
-#PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=
-#PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_DIR=kernel-samsung
-#PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_CONFIG=cyanogen_galaxys_defconfig
-
-# Extra galaxys overlay
-PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/galaxysmtd
-
-# Add the FM app
-PRODUCT_PACKAGES += FM
-
-# Extra RIL settings
-PRODUCT_PROPERTY_OVERRIDES += \
-    ro.ril.enable.managed.roaming=1 \
-    ro.ril.oem.nosim.ecclist=911,112,999,000,08,118,120,122,110,119,995 \
-    ro.ril.emc.mode=2
-
-# Add additional mounts
-PRODUCT_PROPERTY_OVERRIDES += \
-    ro.additionalmounts=/mnt/emmc \
-    ro.vold.switchablepair=/mnt/sdcard,/mnt/emmc
-
-# Release name and versioning
-PRODUCT_RELEASE_NAME := GalaxyS
-PRODUCT_VERSION_DEVICE_SPECIFIC :=
--include vendor/cyanogen/products/common_versions.mk
-
-#
-# Copy galaxys specific prebuilt files
-#
-PRODUCT_COPY_FILES +=  \
-    vendor/cyanogen/prebuilt/hdpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/products/cyanogen_generic.mk b/products/cyanogen_generic.mk
deleted file mode 100644
index d22a458..0000000
--- a/products/cyanogen_generic.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# Inherit AOSP device configuration for generic target
-$(call inherit-product, build/target/product/full.mk)
-
-# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common_full.mk)
-
-#
-# Setup device specific product configuration.
-#
-PRODUCT_NAME := cyanogen_generic
-PRODUCT_BRAND := cyanogenmod
-PRODUCT_DEVICE := generic
-PRODUCT_MODEL := CyanogenMod
-PRODUCT_MANUFACTURER := CyanogenMod
-
-#
-# Move dalvik cache to data partition where there is more room to solve startup problems
-#
-PRODUCT_PROPERTY_OVERRIDES += dalvik.vm.dexopt-data-only=1
-
-# Generic modversion
-ro.modversion=CyanogenMod-7
diff --git a/products/cyanogen_glacier.mk b/products/cyanogen_glacier.mk
deleted file mode 100644
index 116d431..0000000
--- a/products/cyanogen_glacier.mk
+++ /dev/null
@@ -1,46 +0,0 @@
-# Inherit device configuration for glacier.
-$(call inherit-product, device/htc/glacier/glacier.mk)
-
-# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common_full.mk)
-
-# Include GSM stuff
-$(call inherit-product, vendor/cyanogen/products/gsm.mk)
-
-#
-# Setup device specific product configuration.
-#
-PRODUCT_NAME := cyanogen_glacier
-PRODUCT_BRAND := tmobile
-PRODUCT_DEVICE := glacier
-PRODUCT_MODEL := HTC Glacier
-PRODUCT_MANUFACTURER := HTC
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=htc_glacier BUILD_ID=GRJ22 BUILD_FINGERPRINT=tmobile/htc_glacier/glacier:2.3.4/GRJ22/95282:user/release-keys PRIVATE_BUILD_DESC="2.19.531.1 CL95282 release-keys"
-
-# Build kernel
-#PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=
-#PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_DIR=kernel-msm
-#PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_CONFIG=cyanogen_glacier_defconfig
-
-# Extra glacier overlay
-PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/glacier
-
-#Include Torch
-PRODUCT_PACKAGES += Torch
-
-# Build GanOptimizer
-PRODUCT_PACKAGES += GanOptimizer
-
-# Broadcom FM radio
-$(call inherit-product, vendor/cyanogen/products/bcm_fm_radio.mk)
-
-# Release name and versioning
-PRODUCT_RELEASE_NAME := glacier
-PRODUCT_VERSION_DEVICE_SPECIFIC :=
--include vendor/cyanogen/products/common_versions.mk
-
-#
-# Copy passion specific prebuilt files
-#
-PRODUCT_COPY_FILES +=  \
-    vendor/cyanogen/prebuilt/hdpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/products/cyanogen_hallon.mk b/products/cyanogen_hallon.mk
deleted file mode 100644
index 27e805f..0000000
--- a/products/cyanogen_hallon.mk
+++ /dev/null
@@ -1,44 +0,0 @@
-# Inherit device configuration for hallon.
-$(call inherit-product, device/semc/hallon/device_hallon.mk)
-
-# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common_full.mk)
-
-# Include GSM stuff
-$(call inherit-product, vendor/cyanogen/products/gsm.mk)
-
-#
-# Setup device specific product configuration.
-#
-PRODUCT_NAME := cyanogen_hallon
-PRODUCT_BRAND := SEMC
-PRODUCT_DEVICE := hallon
-PRODUCT_MODEL := MT15i
-PRODUCT_MANUFACTURER := Sony Ericsson
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=MT15i BUILD_ID=4.0.2.A.0.42 BUILD_FINGERPRINT=SEMC/MT15i_1247-0875/MT15i:2.3.4/4.0.2.A.0.42/bn_P:user/release-keys PRIVATE_BUILD_DESC="MT15i-user 2.3.4 4.0.2.A.0.42 bn_P test-keys"
-
-# Build kernel
-#PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=
-#PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_DIR=kernel-msm
-#PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_CONFIG=cyanogen_hallon_defconfig
-
-# Extra hallon overlay
-PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/hallon
-
-# Add the Torch app
-PRODUCT_PACKAGES += Torch
-
-
-# BCM FM radio
-#$(call inherit-product, vendor/cyanogen/products/bcm_fm_radio.mk)
-
-# Release name and versioning
-PRODUCT_RELEASE_NAME := XperiaNeo-MT15i
-PRODUCT_VERSION_DEVICE_SPECIFIC :=
--include vendor/cyanogen/products/common_versions.mk
-
-#
-# Copy passion specific prebuilt files
-#
-PRODUCT_COPY_FILES +=  \
-    vendor/cyanogen/prebuilt/hdpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/products/cyanogen_hero.mk b/products/cyanogen_hero.mk
deleted file mode 100644
index ec4c82e..0000000
--- a/products/cyanogen_hero.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-# Inherit AOSP device configuration for hero.
-ifdef CYANOGEN_SMALL
-$(call inherit-product, device/htc/hero/small_hero.mk)
-else
-$(call inherit-product, device/htc/hero/full_hero.mk)
-endif
-
-# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common_full.mk)
-
-# Include GSM stuff
-$(call inherit-product, vendor/cyanogen/products/gsm.mk)
-
-#
-# Setup device specific product configuration.
-#
-PRODUCT_NAME := cyanogen_hero
-PRODUCT_BRAND := htc
-PRODUCT_DEVICE := hero
-PRODUCT_MODEL := Hero
-PRODUCT_MANUFACTURER := HTC
-PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=GRH78 BUILD_FINGERPRINT=google/soju/crespo:2.3.1/GRH78/85442:user/release-keys PRIVATE_BUILD_DESC="soju-user 2.3.1 GRH78 85442 release-keys"
-
-PRODUCT_SPECIFIC_DEFINES += TARGET_PRELINKER_MAP=$(TOP)/vendor/cyanogen/prelink-linux-arm-hero.map
-
-# Release name and versioning
-PRODUCT_RELEASE_NAME := Hero
-PRODUCT_VERSION_DEVICE_SPECIFIC :=
--include vendor/cyanogen/products/common_versions.mk
-
-#
-# Copy passion specific prebuilt files
-#
-PRODUCT_COPY_FILES +=  \
-    vendor/cyanogen/prebuilt/mdpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/products/cyanogen_heroc.mk b/products/cyanogen_heroc.mk
deleted file mode 100644
index a79dda9..0000000
--- a/products/cyanogen_heroc.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-# Inherit AOSP device configuration for heroc.
-$(call inherit-product, device/htc/heroc/heroc.mk)
-
-# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common_full.mk)
-
-
-#
-# Setup device specific product configuration.
-#
-PRODUCT_NAME := cyanogen_heroc
-PRODUCT_BRAND := sprint
-PRODUCT_DEVICE := heroc
-PRODUCT_MODEL := HERO200
-PRODUCT_MANUFACTURER := HTC
-PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=GRI40 BUILD_FINGERPRINT=google/passion/passion:2.3.3/GRI40/102588:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.3.3 GRI40 102588 release-keys"
-
-# Extra overlay for Gallery3D orientation hack
-PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/heroc
-PRODUCT_SPECIFIC_DEFINES += TARGET_PRELINKER_MAP=$(TOP)/vendor/cyanogen/prelink-linux-arm-hero.map
-
-# Release name and versioning
-PRODUCT_RELEASE_NAME := Heroc
-PRODUCT_VERSION_DEVICE_SPECIFIC :=
--include vendor/cyanogen/products/common_versions.mk
-
-#
-# Copy dream/sapphire specific prebuilt files
-#
-PRODUCT_COPY_FILES +=  \
-    vendor/cyanogen/prebuilt/mdpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/products/cyanogen_inc.mk b/products/cyanogen_inc.mk
deleted file mode 100644
index e942af3..0000000
--- a/products/cyanogen_inc.mk
+++ /dev/null
@@ -1,36 +0,0 @@
-$(call inherit-product, device/htc/inc/inc.mk)
-
-# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common_full.mk)
-
-#
-# Setup device specific product configuration.
-#
-PRODUCT_NAME := cyanogen_inc
-PRODUCT_BRAND := htc
-PRODUCT_DEVICE := inc
-PRODUCT_MODEL := Incredible
-PRODUCT_MANUFACTURER := HTC
-PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=FRF91 PRODUCT_NAME=inc BUILD_FINGERPRINT=verizon_wwe/inc/inc/inc:2.2/FRF91/264707:user/release-keys PRODUCT_BRAND=verizon_wwe TARGET_BUILD_TYPE=user BUILD_VERSION_TAGS=release-keys PRIVATE_BUILD_DESC="3.26.605.1 CL264707 release-keys" PRODUCT_MODEL=ADR6300 PRODUCT_MANUFACTURER=HTC
-
-PRODUCT_PROPERTY_OVERRIDES += ro.product.version=3.26.605.1
-
-# Extra Passion overlay
-PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/inc
-
-# Add the Torch app
-PRODUCT_PACKAGES += Torch
-
-# Broadcom FM radio
-$(call inherit-product, vendor/cyanogen/products/bcm_fm_radio.mk)
-
-# Release name and versioning
-PRODUCT_RELEASE_NAME := Inc
-PRODUCT_VERSION_DEVICE_SPECIFIC :=
--include vendor/cyanogen/products/common_versions.mk
-
-#
-# Copy passion specific prebuilt files
-#
-PRODUCT_COPY_FILES +=  \
-    vendor/cyanogen/prebuilt/hdpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/products/cyanogen_iyokan.mk b/products/cyanogen_iyokan.mk
deleted file mode 100644
index 85d1f26..0000000
--- a/products/cyanogen_iyokan.mk
+++ /dev/null
@@ -1,44 +0,0 @@
-# Inherit device configuration for iyokan.
-$(call inherit-product, device/semc/iyokan/device_iyokan.mk)
-
-# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common_full.mk)
-
-# Include GSM stuff
-$(call inherit-product, vendor/cyanogen/products/gsm.mk)
-
-#
-# Setup device specific product configuration.
-#
-PRODUCT_NAME := cyanogen_iyokan
-PRODUCT_BRAND := SEMC
-PRODUCT_DEVICE := iyokan
-PRODUCT_MODEL := MK16i
-PRODUCT_MANUFACTURER := Sony Ericsson
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=MK16i BUILD_ID=4.0.1.A.0.283 BUILD_FINGERPRINT=SEMC/MK16i_1247-1061/MK16i:2.3.4/4.0.1.A.0.283/bn_P:user/release-keys PRIVATE_BUILD_DESC="MK16i-user 2.3.4 4.0.1.A.0.283 bn_P test-keys"
-
-# Build kernel
-#PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=
-#PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_DIR=kernel-msm
-#PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_CONFIG=cyanogen_iyokan_defconfig
-
-# Extra iyokan overlay
-PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/iyokan
-
-# Add the Torch app
-PRODUCT_PACKAGES += Torch
-
-
-# BCM FM radio
-#$(call inherit-product, vendor/cyanogen/products/bcm_fm_radio.mk)
-
-# Release name and versioning
-PRODUCT_RELEASE_NAME := XperiaPro-MK16i
-PRODUCT_VERSION_DEVICE_SPECIFIC :=
--include vendor/cyanogen/products/common_versions.mk
-
-#
-# Copy passion specific prebuilt files
-#
-PRODUCT_COPY_FILES +=  \
-    vendor/cyanogen/prebuilt/hdpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/products/cyanogen_jordan.mk b/products/cyanogen_jordan.mk
deleted file mode 100644
index 4105463..0000000
--- a/products/cyanogen_jordan.mk
+++ /dev/null
@@ -1,50 +0,0 @@
-# Inherit AOSP device configuration.
-$(call inherit-product, device/motorola/jordan/jordan.mk)
-
-# Inherit common GSM stuff
-$(call inherit-product, vendor/cyanogen/products/gsm.mk)
-
-# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common_full.mk)
-
-# Extra jordan overlay
-PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/jordan
-
-# Add the Torch app
-PRODUCT_PACKAGES += Torch
-
-#
-# Setup device specific product configuration.
-#
-PRODUCT_NAME := cyanogen_jordan
-PRODUCT_BRAND := MOTO
-PRODUCT_DEVICE := jordan
-PRODUCT_MODEL := MB525
-PRODUCT_MANUFACTURER := Motorola
-PRODUCT_SFX := JOREM_U3
-
-# Release name and versioning
-PRODUCT_RELEASE_NAME := Defy
-PRODUCT_VERSION_DEVICE_SPECIFIC :=
--include vendor/cyanogen/products/common_versions.mk
-
-UTC_DATE := $(shell date +%s)
-DATE     := $(shell date +%Y%m%d)
-
-PRODUCT_BUILD_PROP_OVERRIDES += \
-    BUILD_ID=GWK74 \
-    PRODUCT_NAME=${PRODUCT_MODEL}_${PRODUCT_SFX} \
-    TARGET_DEVICE=umts_jordan \
-    BUILD_FINGERPRINT=MOTO/MB526_RTDACH/umts_jordan:2.3.4/4.5.1-134_DFP-74/1313117579:user/release-keys \
-    PRIVATE_BUILD_DESC="umts_jordan_emara-user 2.3.4 4.5.1-134_DFP-74 1313117579 release-keys" \
-    BUILD_NUMBER=${DATE} \
-    BUILD_VERSION_TAGS=release-keys \
-    TARGET_BUILD_TYPE=user
-
-#
-# Copy jordan specific prebuilt files
-#
-PRODUCT_COPY_FILES += \
-    vendor/cyanogen/prebuilt/hdpi/media/bootanimation.zip:system/media/bootanimation.zip
-
-
diff --git a/products/cyanogen_legend.mk b/products/cyanogen_legend.mk
deleted file mode 100644
index 459121f..0000000
--- a/products/cyanogen_legend.mk
+++ /dev/null
@@ -1,33 +0,0 @@
-# Inherit AOSP device configuration for legend.
-$(call inherit-product, device/htc/legend/legend.mk)
-
-# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common_full.mk)
-
-# Include GSM stuff
-$(call inherit-product, vendor/cyanogen/products/gsm.mk)
-
-
-PRODUCT_NAME := cyanogen_legend
-PRODUCT_BRAND := htc
-PRODUCT_DEVICE := legend
-PRODUCT_MODEL := Legend
-PRODUCT_MANUFACTURER := HTC
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=htc_legend BUILD_ID=GRH55 BUILD_FINGERPRINT=google/soju/crespo:2.3/GRH55/79397:user/release-keys PRIVATE_BUILD_DESC="soju-user 2.3 GRH55 79397 release-keys"
-
-PRODUCT_SPECIFIC_DEFINES += TARGET_PRELINKER_MAP=$(TOP)/vendor/cyanogen/prelink-linux-arm-msm722x.map
-
-PRODUCT_PACKAGES += Torch
-
-# TI FM radio
-$(call inherit-product, vendor/cyanogen/products/ti_fm_radio.mk)
-
-PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/legend
-
-# Release name and versioning
-PRODUCT_RELEASE_NAME := Legend
-PRODUCT_VERSION_DEVICE_SPECIFIC :=
--include vendor/cyanogen/products/common_versions.mk
-
-PRODUCT_COPY_FILES +=  \
-    vendor/cyanogen/prebuilt/mdpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/products/cyanogen_leo.mk b/products/cyanogen_leo.mk
deleted file mode 100644
index 8d80f50..0000000
--- a/products/cyanogen_leo.mk
+++ /dev/null
@@ -1,45 +0,0 @@
-# Inherit AOSP device configuration for leo.
-$(call inherit-product, device/htc/leo/full_leo.mk)
-
-# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common_full.mk)
-
-# Include GSM stuff
-$(call inherit-product, vendor/cyanogen/products/gsm.mk)
-
-#
-# Setup device specific product configuration.
-#
-
-PRODUCT_NAME := cyanogen_leo
-PRODUCT_BRAND := htc_wwe
-PRODUCT_DEVICE := leo
-PRODUCT_MODEL := HTC HD2
-PRODUCT_MANUFACTURER := HTC
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=passion BUILD_ID=GRI40 BUILD_FINGERPRINT=google/passion/passion:2.3.3/GRI40/102588:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.3.3 GRI40 102588 release-keys"
-
-# Extra leo overlay
-PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/leo
-
-# Extra RIL settings
-PRODUCT_PROPERTY_OVERRIDES += \
-    ro.ril.enable.managed.roaming=1 \
-    ro.ril.oem.nosim.ecclist=911,112,113,115,117,999,000,08,118,120,122,110,119,995 \
-    ro.ril.emc.mode=2
-
-# Add the Torch app
-PRODUCT_PACKAGES += Torch
-
-# Broadcom FM radio
-$(call inherit-product, vendor/cyanogen/products/bcm_fm_radio.mk)
-
-# Release name and versioning
-PRODUCT_RELEASE_NAME := LEO
-PRODUCT_VERSION_DEVICE_SPECIFIC :=
--include vendor/cyanogen/products/common_versions.mk
-
-#
-# Copy leo specific prebuilt files
-#
-PRODUCT_COPY_FILES +=  \
-    vendor/cyanogen/prebuilt/hdpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/products/cyanogen_liberty.mk b/products/cyanogen_liberty.mk
deleted file mode 100644
index ed3e136..0000000
--- a/products/cyanogen_liberty.mk
+++ /dev/null
@@ -1,34 +0,0 @@
-# Inherit AOSP device configuration for liberty.
-$(call inherit-product, device/htc/liberty/liberty.mk)
-
-# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common_full.mk)
-
-# Include GSM stuff
-$(call inherit-product, vendor/cyanogen/products/gsm.mk)
-
-#
-# Setup device specific product configuration.
-#
-PRODUCT_NAME := cyanogen_liberty
-PRODUCT_BRAND := htc
-PRODUCT_DEVICE := liberty
-PRODUCT_MODEL := Liberty
-PRODUCT_MANUFACTURER := HTC
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=htc_liberty BUILD_ID=GRK39F BUILD_FINGERPRINT=google/passion/passion:2.3.6/GRK39F/189904:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.3.6 GRK39F 189904 release-keys"
-
-PRODUCT_SPECIFIC_DEFINES += TARGET_PRELINKER_MAP=$(TOP)/vendor/cyanogen/prelink-linux-arm-msm722x.map
-
-# Broadcom FM radio
-$(call inherit-product, vendor/cyanogen/products/bcm_fm_radio.mk)
-
-# Release name and versioning
-PRODUCT_RELEASE_NAME := Liberty
-PRODUCT_VERSION_DEVICE_SPECIFIC :=
--include vendor/cyanogen/products/common_versions.mk
-
-#
-# Copy liberty specific prebuilt files
-#
-PRODUCT_COPY_FILES +=  \
-    vendor/cyanogen/prebuilt/mdpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/products/cyanogen_mango.mk b/products/cyanogen_mango.mk
deleted file mode 100644
index 6fce3ea..0000000
--- a/products/cyanogen_mango.mk
+++ /dev/null
@@ -1,44 +0,0 @@
-# Inherit device configuration for mango.
-$(call inherit-product, device/semc/mango/device_mango.mk)
-
-# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common_full.mk)
-
-# Include GSM stuff
-$(call inherit-product, vendor/cyanogen/products/gsm.mk)
-
-#
-# Setup device specific product configuration.
-#
-PRODUCT_NAME := cyanogen_mango
-PRODUCT_BRAND := SEMC
-PRODUCT_DEVICE := mango
-PRODUCT_MODEL := SK17i
-PRODUCT_MANUFACTURER := Sony Ericsson
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=SK17i BUILD_ID=4.0.2.A.0.42 BUILD_FINGERPRINT=SEMC/SK17i_1249-8062/SK17i:2.3.4/4.0.2.A.0.42/j_b_3w:user/release-keys PRIVATE_BUILD_DESC="SK17i-user 2.3.4 4.0.2.A.0.42 j_b_3w test-keys"
-
-# Build kernel
-#PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=
-#PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_DIR=kernel-msm
-#PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_CONFIG=cyanogen_mango_defconfig
-
-# Extra mango overlay
-PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/mango
-
-# Add the Torch app
-PRODUCT_PACKAGES += Torch
-
-
-# BCM FM radio
-#$(call inherit-product, vendor/cyanogen/products/bcm_fm_radio.mk)
-
-# Release name and versioning
-PRODUCT_RELEASE_NAME := XperiaMiniPro-SK17i
-PRODUCT_VERSION_DEVICE_SPECIFIC :=
--include vendor/cyanogen/products/common_versions.mk
-
-#
-# Copy passion specific prebuilt files
-#
-PRODUCT_COPY_FILES +=  \
-    vendor/cyanogen/prebuilt/mdpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/products/cyanogen_mecha.mk b/products/cyanogen_mecha.mk
deleted file mode 100644
index efe19ed..0000000
--- a/products/cyanogen_mecha.mk
+++ /dev/null
@@ -1,38 +0,0 @@
-# Inherit device configuration for mecha.
-$(call inherit-product, device/htc/mecha/device_mecha.mk)
-
-# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common_full.mk)
-
-#
-# Setup device specific product configuration.
-#
-PRODUCT_NAME := cyanogen_mecha
-PRODUCT_BRAND := verizon_wwe
-PRODUCT_DEVICE := mecha
-PRODUCT_MODEL := ADR6400L
-PRODUCT_MANUFACTURER := HTC
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=htc_mecha BUILD_ID=FRG83D BUILD_FINGERPRINT=verizon_wwe/htc_mecha/mecha/mecha:2.2.1/FRG83D/343953:user/release-keys PRIVATE_BUILD_DESC="1.70.605.0 CL343953 release-keys"
-
-# Extra Mecha overlay
-PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/mecha
-
-# Add the Torch app
-PRODUCT_PACKAGES += Torch
-
-# Broadcom FM radio
-$(call inherit-product, vendor/cyanogen/products/bcm_fm_radio.mk)
-
-# SIM Toolkit
-PRODUCT_PACKAGES += Stk
-
-# Release name and versioning
-PRODUCT_RELEASE_NAME := Thunderbolt
-PRODUCT_VERSION_DEVICE_SPECIFIC :=
--include vendor/cyanogen/products/common_versions.mk
-
-#
-# Copy passion specific prebuilt files
-#
-PRODUCT_COPY_FILES +=  \
-    vendor/cyanogen/prebuilt/hdpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/products/cyanogen_mesmerizemtd.mk b/products/cyanogen_mesmerizemtd.mk
deleted file mode 100644
index 9d6f53c..0000000
--- a/products/cyanogen_mesmerizemtd.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-# Inherit AOSP device configuration for mesmerizemtd.
-$(call inherit-product, device/samsung/mesmerizemtd/full_mesmerizemtd.mk)
-
-# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common_full.mk)
-
-#
-# Setup device specific product configuration.
-#
-PRODUCT_NAME := cyanogen_mesmerizemtd
-PRODUCT_BRAND := samsung
-PRODUCT_DEVICE := mesmerizemtd
-PRODUCT_MODEL := SCH-I500
-PRODUCT_MANUFACTURER := samsung
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=SCH-I500 BUILD_ID=GINGERBREAD BUILD_FINGERPRINT=uscc/SCH-I500/SCH-I500:2.3.4/GINGERBREAD/EH09:user/release-keys PRIVATE_BUILD_DESC="SCH-I500-user 2.3.4 GINGERBREAD EH09 release-keys"
-
-# Extra mesmerizemtd overlay
-PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/mesmerizemtd
-
-# Add the Torch app
-PRODUCT_PACKAGES += Torch
-
-# Release name and versioning
-PRODUCT_RELEASE_NAME := Mesmerize
-PRODUCT_VERSION_DEVICE_SPECIFIC :=
--include vendor/cyanogen/products/common_versions.mk
-
-#
-# Copy galaxys specific prebuilt files
-#
-PRODUCT_COPY_FILES +=  \
-    vendor/cyanogen/prebuilt/hdpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/products/cyanogen_mimmi.mk b/products/cyanogen_mimmi.mk
deleted file mode 100644
index af01135..0000000
--- a/products/cyanogen_mimmi.mk
+++ /dev/null
@@ -1,41 +0,0 @@
-# Inherit device configuration for mimmi.
-$(call inherit-product, device/semc/mimmi/device_mimmi.mk)
-
-# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common_full.mk)
-
-# Include GSM stuff
-$(call inherit-product, vendor/cyanogen/products/gsm.mk)
-
-#
-# Setup device specific product configuration.
-#
-PRODUCT_NAME := cyanogen_mimmi
-PRODUCT_BRAND := SEMC
-PRODUCT_DEVICE := mimmi
-PRODUCT_MODEL := U20i
-PRODUCT_MANUFACTURER := Sony Ericsson
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_DEVICE=U20i PRODUCT_NAME=U20i BUILD_ID=3.0.1.A.0.145 BUILD_FINGERPRINT=SEMC/LT15i_1247-1073/LT15i:2.3.3/3.0.1.A.0.145/bn_p:user/release-keys PRIVATE_BUILD_DESC="LT15i-user 2.3.3 3.0.1.A.0.145 bn_P test-keys"
-
-# Add the Torch app
-PRODUCT_PACKAGES += Torch
-
-# Add LDPI assets, in addition to MDPI
-PRODUCT_LOCALES += ldpi mdpi
-
-# Extra overlay for LDPI
-PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/ldpi
-
-# Ti FM radio
-#$(call inherit-product, vendor/cyanogen/products/ti_fm_radio.mk)
-
-# Release name and versioning
-PRODUCT_RELEASE_NAME := X10MiniPro
-PRODUCT_VERSION_DEVICE_SPECIFIC :=
--include vendor/cyanogen/products/common_versions.mk
-
-#
-# Copy MDPI specific prebuilt files
-#
-PRODUCT_COPY_FILES +=  \
-    vendor/cyanogen/prebuilt/ldpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/products/cyanogen_morrison.mk b/products/cyanogen_morrison.mk
deleted file mode 100644
index 21679fa..0000000
--- a/products/cyanogen_morrison.mk
+++ /dev/null
@@ -1,33 +0,0 @@
-# Inherit AOSP device configuration for zeppelin.
-$(call inherit-product, device/motorola/morrison/morrison.mk)
-
-# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common_full.mk)
-
-$(call inherit-product vendor/cyanogen/products/bcm_fm_radio.mk)
-
-$(call inherit-product, vendor/cyanogen/products/gsm.mk)
-
-#
-# Setup device specific product configuration.
-#
-PRODUCT_NAME := cyanogen_morrison
-PRODUCT_BRAND := motorola
-PRODUCT_DEVICE := morrison
-PRODUCT_MODEL := MB200
-PRODUCT_MANUFACTURER := Motorola
-
-# Release name and versioning
-PRODUCT_RELEASE_NAME := CLIQ
-PRODUCT_VERSION_DEVICE_SPECIFIC :=
--include vendor/cyanogen/products/common_versions.mk
-
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=morrison TARGET_DEVICE=morrison BUILD_ID=GRJ22 BUILD_FINGERPRINT=google/soju/crespo:2.3.4/GRJ22/121341:user/release-keys PRIVATE_BUILD_DESC="soju-user 2.3.4 GRJ22 121341 release-keys" BUILD_NUMBER=121341
-
-PRODUCT_COPY_FILES +=  \
-    vendor/cyanogen/prebuilt/mdpi/media/bootanimation.zip:system/media/bootanimation.zip
-
-PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/morrison
-
-# Add the FM app
-PRODUCT_PACKAGES += FM
diff --git a/products/cyanogen_motus.mk b/products/cyanogen_motus.mk
deleted file mode 100644
index 36b3d45..0000000
--- a/products/cyanogen_motus.mk
+++ /dev/null
@@ -1,28 +0,0 @@
-# Inherit AOSP device configuration for motus.
-$(call inherit-product, device/motorola/motus/motus.mk)
-
-# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common_full.mk)
-
-$(call inherit-product, vendor/cyanogen/products/gsm.mk)
-
-#
-# Setup device specific product configuration.
-#
-PRODUCT_NAME := cyanogen_motus
-PRODUCT_BRAND := motus
-PRODUCT_DEVICE := motus
-PRODUCT_MODEL := MB300
-PRODUCT_MANUFACTURER := Motorola
-
-# Release name and versioning
-PRODUCT_RELEASE_NAME := BACKFLIP
-PRODUCT_VERSION_DEVICE_SPECIFIC :=
--include vendor/cyanogen/products/common_versions.mk
-
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=motus_att_us TARGET_DEVICE=motus BUILD_ID=GRJ22 BUILD_FINGERPRINT=google/soju/crespo:2.3.4/GRJ22/121341:user/release-keys PRIVATE_BUILD_DESC="soju-user 2.3.4 GRJ22 121341 release-keys" BUILD_NUMBER=121341
-
-PRODUCT_COPY_FILES +=  \
-    vendor/cyanogen/prebuilt/mdpi/media/bootanimation.zip:system/media/bootanimation.zip
-
-PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/motus
diff --git a/products/cyanogen_olympus.mk b/products/cyanogen_olympus.mk
deleted file mode 100644
index 333efe1..0000000
--- a/products/cyanogen_olympus.mk
+++ /dev/null
@@ -1,33 +0,0 @@
-# Inherit device configuration for olympus.
-$(call inherit-product, device/motorola/olympus/olympus.mk)
-
-# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common_full.mk)
-
-# Include GSM stuff
-$(call inherit-product, vendor/cyanogen/products/gsm.mk)
-
-#
-# Setup device specific product configuration.
-#
-PRODUCT_NAME := cyanogen_olympus
-PRODUCT_BRAND := motorola
-PRODUCT_DEVICE := olympus
-PRODUCT_MODEL := MB860
-PRODUCT_MANUFACTURER := Motorola
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_BRAND=MOTO PRODUCT_NAME=olyatt BUILD_ID=4.5.91 BUILD_PRODUCT=olyatt BUILD_FINGERPRINT=MOTO/olyatt/olympus:2.3.4/4.5.91/110625:user/release-keys PRIVATE_BUILD_DESC="olympus-user 2.3.4 4.5.91 110625 release-keys"
-
-# Extra Olympus overlay
-PRODUCT_PACKAGE_OVERLAYS += \
-	vendor/cyanogen/overlay/olympus \
-#	vendor/cyanogen/overlay/qhd
-
-PRODUCT_RELEASE_NAME := Olympus
-PRODUCT_VERSION_DEVICE_SPECIFIC :=
--include vendor/cyanogen/products/common_versions.mk
-
-#
-# Copy hdpi specific prebuilt files
-#
-PRODUCT_COPY_FILES +=  \
-    vendor/cyanogen/prebuilt/hdpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/products/cyanogen_one.mk b/products/cyanogen_one.mk
deleted file mode 100644
index fda23c9..0000000
--- a/products/cyanogen_one.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-# Inherit AOSP device configuration for geeksphone one.
-$(call inherit-product, device/geeksphone/one/one.mk)
-
-# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common.mk)
-
-# Include GSM stuff
-$(call inherit-product, vendor/cyanogen/products/gsm.mk)
-
-#
-# Setup device specific product configuration.
-#
-PRODUCT_NAME := cyanogen_one
-PRODUCT_BRAND := geeksphone
-PRODUCT_DEVICE := one
-PRODUCT_MODEL := Geeksphone ONE
-PRODUCT_MANUFACTURER := Geeksphone
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_DEVICE=geeksphone-one PRODUCT_NAME=geeksphone_one BUILD_ID=GRI40 BUILD_FINGERPRINT=google/passion/passion:2.3.3/GRI40/102588:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.3.3 GRI40 102588 release-keys"
-
-# Add the CMWallpapers app
-PRODUCT_PACKAGES += CMWallpapers
-
-#
-# Move dalvik cache to data partition where there is more room to solve startup problems
-#
-PRODUCT_PROPERTY_OVERRIDES += dalvik.vm.dexopt-data-only=1
-
-# Release name and versioning
-PRODUCT_RELEASE_NAME := ONE
-PRODUCT_VERSION_DEVICE_SPECIFIC :=
--include vendor/cyanogen/products/common_versions.mk
-
-#
-# Copy GPO specific prebuilt files
-#
-PRODUCT_COPY_FILES +=  \
-    vendor/cyanogen/prebuilt/ldpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/products/cyanogen_p970.mk b/products/cyanogen_p970.mk
deleted file mode 100644
index 1e0864b..0000000
--- a/products/cyanogen_p970.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-# Include GSM stuff
-$(call inherit-product, vendor/cyanogen/products/gsm.mk)
-
-# Inherit device configuration
-$(call inherit-product, device/lge/p970/p970.mk)
-
-# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common_full.mk)
-
-#
-# Setup device specific product configuration.
-#
-PRODUCT_NAME := cyanogen_p970
-PRODUCT_BRAND := lge
-PRODUCT_DEVICE := p970
-PRODUCT_MODEL := LG-P970
-PRODUCT_MANUFACTURER := LGE
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=lge_bproj BUILD_ID=GRJ22 BUILD_FINGERPRINT="lge/lge_bproj/bproj_EUR-XXX:2.3.4/GRJ22/LG-P970-V20d.421CC761:user/release-keys" PRIVATE_BUILD_DESC="lge_bproj-user 2.3.4 GRJ22 LG-P970-V20d.421CC761 release-keys"
-
-# Broadcom FM radio
-$(call inherit-product, vendor/cyanogen/products/bcm_fm_radio.mk)
-
-# Release name and versioning
-PRODUCT_RELEASE_NAME := OptimusBlack
-PRODUCT_VERSION_DEVICE_SPECIFIC :=
--include vendor/cyanogen/products/common_versions.mk
-
-#
-# Copy prebuilt files
-#
-PRODUCT_COPY_FILES +=  \
-    vendor/cyanogen/prebuilt/hdpi/media/bootanimation.zip:system/media/bootanimation.zip
-
-# Add the Torch app
-PRODUCT_PACKAGES += Torch
diff --git a/products/cyanogen_p990.mk b/products/cyanogen_p990.mk
deleted file mode 100644
index f3a871c..0000000
--- a/products/cyanogen_p990.mk
+++ /dev/null
@@ -1,38 +0,0 @@
-# Inherit device configuration
-$(call inherit-product, device/lge/p990/p990.mk)
-
-# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common_full.mk)
-
-# Include GSM stuff
-$(call inherit-product, vendor/cyanogen/products/gsm.mk)
-
-#
-# Setup device specific product configuration.
-#
-PRODUCT_NAME := cyanogen_p990
-PRODUCT_BRAND := lge
-PRODUCT_DEVICE := p990
-PRODUCT_MODEL := Optimus 2X
-PRODUCT_MANUFACTURER := LGE
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=lge_star BUILD_ID=GRJ22 BUILD_FINGERPRINT=lge/lge_star/p990_EUR-xx:2.3.4/GRJ22/lgp990-V20l.422C563E:user/release-keys PRIVATE_BUILD_DESC="lge_star-user 2.3.4 GRJ22 422C563E release-keys"
-
-# Extra Star overlay
-PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/star
-
-# Broadcom FM radio
-$(call inherit-product, vendor/cyanogen/products/bcm_fm_radio.mk)
-
-# Release name and versioning
-PRODUCT_RELEASE_NAME := Optimus2X
-PRODUCT_VERSION_DEVICE_SPECIFIC :=
--include vendor/cyanogen/products/common_versions.mk
-
-#
-# Copy prebuilt files
-#
-PRODUCT_COPY_FILES +=  \
-    vendor/cyanogen/prebuilt/hdpi/media/bootanimation.zip:system/media/bootanimation.zip
-
-# Add the Torch app
-PRODUCT_PACKAGES += Torch
diff --git a/products/cyanogen_p999.mk b/products/cyanogen_p999.mk
deleted file mode 100644
index 131237b..0000000
--- a/products/cyanogen_p999.mk
+++ /dev/null
@@ -1,46 +0,0 @@
-# Inherit device configuration for p999.
-$(call inherit-product, device/lge/p999/p999.mk)
-
-# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common_full.mk)
-
-# Include GSM stuff
-$(call inherit-product, vendor/cyanogen/products/gsm.mk)
-
-#
-# Setup device specific product configuration.
-#
-PRODUCT_NAME := cyanogen_p999
-PRODUCT_BRAND := lge
-PRODUCT_DEVICE := p999
-PRODUCT_MODEL := LG-P999
-PRODUCT_MANUFACTURER := lge
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=lge_lge_star BUILD_ID=GRI40 BUILD_FINGERPRINT=lge/lge_lge_star/p999:2.3.3/GRI40/lgp999-V21e.41fdc8a2:user/release-keys PRIVATE_BUILD_DESC="lge_star-user 2.3.3 GRI40 41fdc8a2 release-keys"
-
-# Build kernel
-#PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=
-#PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_DIR=kernel-msm
-#PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_CONFIG=cyanogen_vision_defconfig
-
-# Extra Star overlay
-PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/star
-
-# Add the Torch app
-PRODUCT_PACKAGES += Torch
-
-# Build GanOptimizer
-PRODUCT_PACKAGES += GanOptimizer
-
-# Broadcom FM radio
-#$(call inherit-product, vendor/cyanogen/products/bcm_fm_radio.mk)
-
-# Release name and versioning
-PRODUCT_RELEASE_NAME := G2x
-PRODUCT_VERSION_DEVICE_SPECIFIC :=
--include vendor/cyanogen/products/common_versions.mk
-
-#
-# Copy hdpi specific prebuilt files
-#
-PRODUCT_COPY_FILES +=  \
-    vendor/cyanogen/prebuilt/hdpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/products/cyanogen_passion.mk b/products/cyanogen_passion.mk
deleted file mode 100644
index 4301e8c..0000000
--- a/products/cyanogen_passion.mk
+++ /dev/null
@@ -1,49 +0,0 @@
-# Inherit AOSP device configuration for passion.
-$(call inherit-product, device/htc/passion/full_passion.mk)
-
-# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common_full.mk)
-
-# Include GSM stuff
-$(call inherit-product, vendor/cyanogen/products/gsm.mk)
-
-#
-# Setup device specific product configuration.
-#
-PRODUCT_NAME := cyanogen_passion
-PRODUCT_BRAND := google
-PRODUCT_DEVICE := passion
-PRODUCT_MODEL := Nexus One
-PRODUCT_MANUFACTURER := HTC
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=passion BUILD_ID=GRK39F BUILD_FINGERPRINT=google/passion/passion:2.3.6/GRK39F/189904:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.3.6 GRK39F 189904 release-keys"
-
-# Build kernel
-PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=
-PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_DIR=kernel-msm
-PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_CONFIG=cyanogen_mahimahi_defconfig
-
-# Extra Passion overlay
-PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/passion
-
-# Add the Torch app
-PRODUCT_PACKAGES += Torch
-
-# Broadcom FM radio
-$(call inherit-product, vendor/cyanogen/products/bcm_fm_radio.mk)
-
-# Extra RIL settings
-PRODUCT_PROPERTY_OVERRIDES += \
-    ro.ril.enable.managed.roaming=1 \
-    ro.ril.oem.nosim.ecclist=911,112,999,000,08,118,120,122,110,119,995 \
-    ro.ril.emc.mode=2
-
-# Release name and versioning
-PRODUCT_RELEASE_NAME := N1
-PRODUCT_VERSION_DEVICE_SPECIFIC :=
--include vendor/cyanogen/products/common_versions.mk
-
-#
-# Copy passion specific prebuilt files
-#
-PRODUCT_COPY_FILES +=  \
-    vendor/cyanogen/prebuilt/hdpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/products/cyanogen_robyn.mk b/products/cyanogen_robyn.mk
deleted file mode 100644
index 9256c7b..0000000
--- a/products/cyanogen_robyn.mk
+++ /dev/null
@@ -1,41 +0,0 @@
-# Inherit device configuration for robyn.
-$(call inherit-product, device/semc/robyn/device_robyn.mk)
-
-# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common_full.mk)
-
-# Include GSM stuff
-$(call inherit-product, vendor/cyanogen/products/gsm.mk)
-
-#
-# Setup device specific product configuration.
-#
-PRODUCT_NAME := cyanogen_robyn
-PRODUCT_BRAND := SEMC
-PRODUCT_DEVICE := robyn
-PRODUCT_MODEL := E10i
-PRODUCT_MANUFACTURER := Sony Ericsson
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_DEVICE=E10i PRODUCT_NAME=E10i BUILD_ID=3.0.1.A.0.145 BUILD_FINGERPRINT=SEMC/LT15i_1247-1073/LT15i:2.3.3/3.0.1.A.0.145/bn_p:user/release-keys PRIVATE_BUILD_DESC="LT15i-user 2.3.3 3.0.1.A.0.145 bn_P test-keys"
-
-# Add the Torch app
-PRODUCT_PACKAGES += Torch
-
-# Add LDPI assets, in addition to MDPI
-PRODUCT_LOCALES += ldpi mdpi
-
-# Extra overlay for LDPI
-PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/ldpi
-
-# Ti FM radio
-#$(call inherit-product, vendor/cyanogen/products/ti_fm_radio.mk)
-
-# Release name and versioning
-PRODUCT_RELEASE_NAME := X10mini
-PRODUCT_VERSION_DEVICE_SPECIFIC :=
--include vendor/cyanogen/products/common_versions.mk
-
-#
-# Copy MDPI specific prebuilt files
-#
-PRODUCT_COPY_FILES +=  \
-    vendor/cyanogen/prebuilt/ldpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/products/cyanogen_saga.mk b/products/cyanogen_saga.mk
deleted file mode 100644
index 3d213ff..0000000
--- a/products/cyanogen_saga.mk
+++ /dev/null
@@ -1,43 +0,0 @@
-# Inherit device configuration for saga.
-$(call inherit-product, device/htc/saga/saga.mk)
-
-# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common_full.mk)
-
-# Include GSM stuff
-$(call inherit-product, vendor/cyanogen/products/gsm.mk)
-
-#
-# Setup device specific product configuration.
-#
-PRODUCT_NAME := cyanogen_saga
-PRODUCT_BRAND := htc_europe
-PRODUCT_DEVICE := saga
-PRODUCT_MODEL := HTC Desire S
-PRODUCT_MANUFACTURER := HTC
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=htc_saga BUILD_ID=GRJ90 BUILD_FINGERPRINT=htc_europe/htc_saga/saga:2.3.5/GRJ90/156318.4:user/release-keys PRIVATE_BUILD_DESC="2.10.401.4 CL156318 release-keys"
-
-# Build kernel
-#PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=
-#PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_DIR=kernel-msm
-#PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_CONFIG=cyanogen_saga_defconfig
-
-# Extra saga overlay
-PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/saga
-
-# Add the Torch app
-PRODUCT_PACKAGES += Torch
-
-# Broadcom FM radio
-$(call inherit-product, vendor/cyanogen/products/bcm_fm_radio.mk)
-
-# Release name and versioning
-PRODUCT_RELEASE_NAME := DesireS
-PRODUCT_VERSION_DEVICE_SPECIFIC :=
--include vendor/cyanogen/products/common_versions.mk
-
-#
-# Copy passion specific prebuilt files
-#
-PRODUCT_COPY_FILES +=  \
-    vendor/cyanogen/prebuilt/hdpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/products/cyanogen_satsuma.mk b/products/cyanogen_satsuma.mk
deleted file mode 100644
index 9e3394c..0000000
--- a/products/cyanogen_satsuma.mk
+++ /dev/null
@@ -1,44 +0,0 @@
-# Inherit device configuration for satsuma.
-$(call inherit-product, device/semc/satsuma/device_satsuma.mk)
-
-# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common_full.mk)
-
-# Include GSM stuff
-$(call inherit-product, vendor/cyanogen/products/gsm.mk)
-
-#
-# Setup device specific product configuration.
-#
-PRODUCT_NAME := cyanogen_satsuma
-PRODUCT_BRAND := SEMC
-PRODUCT_DEVICE := satsuma
-PRODUCT_MODEL := ST17i
-PRODUCT_MANUFACTURER := Sony Ericsson
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=ST17i BUILD_ID=4.0.2.A.0.42 BUILD_FINGERPRINT=SEMC/ST17i_1249-6227/ST17i:2.3.4/4.0.2.A.0.42/j_b_3w:user/release-keys PRIVATE_BUILD_DESC="ST17i-user 2.3.4 4.0.2.A.0.42 j_b_3w test-keys"
-
-# Build kernel
-#PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=
-#PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_DIR=kernel-msm
-#PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_CONFIG=cyanogen_satsuma_defconfig
-
-# Extra satsuma overlay
-PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/satsuma
-
-# Add the Torch app
-PRODUCT_PACKAGES += Torch
-
-
-# BCM FM radio
-#$(call inherit-product, vendor/cyanogen/products/bcm_fm_radio.mk)
-
-# Release name and versioning
-PRODUCT_RELEASE_NAME := XperiaActive-ST17i
-PRODUCT_VERSION_DEVICE_SPECIFIC :=
--include vendor/cyanogen/products/common_versions.mk
-
-#
-# Copy passion specific prebuilt files
-#
-PRODUCT_COPY_FILES +=  \
-    vendor/cyanogen/prebuilt/mdpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/products/cyanogen_shadow.mk b/products/cyanogen_shadow.mk
deleted file mode 100644
index 7960e28..0000000
--- a/products/cyanogen_shadow.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-# Inherit AOSP device configuration for passion.
-$(call inherit-product, device/motorola/shadow/shadow.mk)
-
-# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common_full.mk)
-
-#
-# Setup device specific product configuration.
-#
-PRODUCT_NAME := cyanogen_shadow
-PRODUCT_BRAND := motorola
-PRODUCT_DEVICE := shadow
-PRODUCT_MODEL := DROIDX
-PRODUCT_MANUFACTURER := Motorola
-
-# Release name and versioning
-PRODUCT_RELEASE_NAME := DROIDX
-PRODUCT_VERSION_DEVICE_SPECIFIC :=
--include vendor/cyanogen/products/common_versions.mk
-
-PRODUCT_BUILD_PROP_OVERRIDES := BUILD_ID=VZW PRODUCT_NAME=shadow_vzw TARGET_DEVICE=cdma_shadow BUILD_FINGERPRINT=verizon/shadow_vzw/cdma_shadow/shadow:2.2.1/VZW/23.340:user/ota-rel-keys,release-keys PRODUCT_BRAND=verizon PRIVATE_BUILD_DESC="cdma_shadow-user 2.2.1 VZW 2.3.340 ota-rel-keys,release-keys" BUILD_NUMBER=2.3.340 BUILD_UTC_DATE=1289194863 TARGET_BUILD_TYPE=user BUILD_VERSION_TAGS=release-keys USER=w30471
-
-PRODUCT_COPY_FILES +=  \
-    vendor/cyanogen/prebuilt/hdpi/media/bootanimation.zip:system/media/bootanimation.zip
-
-PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/shadow
-
-# Add the Torch app
-PRODUCT_PACKAGES += Torch
diff --git a/products/cyanogen_shakira.mk b/products/cyanogen_shakira.mk
deleted file mode 100644
index 5248dc7..0000000
--- a/products/cyanogen_shakira.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-# Inherit device configuration for ace.
-$(call inherit-product, device/semc/shakira/device_shakira.mk)
-
-# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common_full.mk)
-
-# Include GSM stuff
-$(call inherit-product, vendor/cyanogen/products/gsm.mk)
-
-#
-# Setup device specific product configuration.
-#
-PRODUCT_NAME := cyanogen_shakira
-PRODUCT_BRAND := SEMC
-PRODUCT_DEVICE := shakira
-PRODUCT_MODEL := E15i
-PRODUCT_MANUFACTURER := Sony Ericsson
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_DEVICE=E15i PRODUCT_NAME=E15i BUILD_ID=3.0.1.A.0.145 BUILD_FINGERPRINT=SEMC/LT15i_1247-1073/LT15i:2.3.3/3.0.1.A.0.145/bn_p:user/release-keys PRIVATE_BUILD_DESC="LT15i-user 2.3.3 3.0.1.A.0.145 bn_P test-keys"
-
-# Extra shakira overlay
-PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/shakira
-
-# Ti FM radio (not implemeted in libaudio)
-#$(call inherit-product, vendor/cyanogen/products/ti_fm_radio.mk)
-
-# Release name and versioning
-PRODUCT_RELEASE_NAME := X8
-PRODUCT_VERSION_DEVICE_SPECIFIC :=
--include vendor/cyanogen/products/common_versions.mk
-
-#
-# Copy MDPI specific prebuilt files
-#
-PRODUCT_COPY_FILES +=  \
-    vendor/cyanogen/prebuilt/mdpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/products/cyanogen_sholes.mk b/products/cyanogen_sholes.mk
deleted file mode 100644
index fb1121d..0000000
--- a/products/cyanogen_sholes.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-# Inherit AOSP device configuration for passion.
-$(call inherit-product, device/motorola/sholes/sholes.mk)
-
-# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common_full.mk)
-
-#
-# Setup device specific product configuration.
-#
-PRODUCT_NAME := cyanogen_sholes
-PRODUCT_BRAND := motorola
-PRODUCT_DEVICE := sholes
-PRODUCT_MODEL := Droid
-PRODUCT_MANUFACTURER := Motorola
-
-# Release name and versioning
-PRODUCT_RELEASE_NAME := Droid
-PRODUCT_VERSION_DEVICE_SPECIFIC :=
--include vendor/cyanogen/products/common_versions.mk
-
-PRODUCT_BUILD_PROP_OVERRIDES := BUILD_ID=FRG83G PRODUCT_NAME=voles TARGET_DEVICE=sholes BUILD_FINGERPRINT=verizon/voles/sholes/sholes:2.2.2/FRG83G/91102:user/release-keys PRODUCT_BRAND=verizon PRIVATE_BUILD_DESC="voles-user 2.2.2 FRG83G 91102 release-keys" BUILD_NUMBER=91102 BUILD_UTC_DATE=1294972140 TARGET_BUILD_TYPE=user BUILD_VERSION_TAGS=release-keys USER=android-build
-
-PRODUCT_COPY_FILES +=  \
-    vendor/cyanogen/prebuilt/hdpi/media/bootanimation.zip:system/media/bootanimation.zip
-
-PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/sholes
-
-# Add the Torch app
-PRODUCT_PACKAGES += Torch
diff --git a/products/cyanogen_showcasemtd.mk b/products/cyanogen_showcasemtd.mk
deleted file mode 100644
index 79d9f01..0000000
--- a/products/cyanogen_showcasemtd.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-# Inherit AOSP device configuration for showcasemtd.
-$(call inherit-product, device/samsung/showcasemtd/full_showcasemtd.mk)
-
-# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common_full.mk)
-
-#
-# Setup device specific product configuration.
-#
-PRODUCT_NAME := cyanogen_showcasemtd
-PRODUCT_BRAND := samsung
-PRODUCT_DEVICE := showcasemtd
-PRODUCT_MODEL := SCH-I500
-PRODUCT_MANUFACTURER := samsung
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=SCH-I500 BUILD_ID=GINGERBREAD BUILD_FINGERPRINT=uscc/SCH-I500/SCH-I500:2.3.4/GINGERBREAD/EH09:user/release-keys PRIVATE_BUILD_DESC="SCH-I500-user 2.3.4 GINGERBREAD EH09 release-keys"
-
-# Extra showcasemtd overlay
-PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/showcasemtd
-
-# Add the Torch app
-PRODUCT_PACKAGES += Torch
-
-# Release name and versioning
-PRODUCT_RELEASE_NAME := Showcase
-PRODUCT_VERSION_DEVICE_SPECIFIC :=
--include vendor/cyanogen/products/common_versions.mk
-
-#
-# Copy galaxys specific prebuilt files
-#
-PRODUCT_COPY_FILES +=  \
-    vendor/cyanogen/prebuilt/hdpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/products/cyanogen_smb_a1002.mk b/products/cyanogen_smb_a1002.mk
deleted file mode 100644
index a5ef8be..0000000
--- a/products/cyanogen_smb_a1002.mk
+++ /dev/null
@@ -1,30 +0,0 @@
-$(call inherit-product, device/malata/smb_a1002/smb_a1002.mk)
-
-# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common_full.mk)
-
-#
-# Setup device specific product configuration.
-#
-PRODUCT_NAME := cyanogen_smb_a1002
-PRODUCT_BRAND := nvidia
-PRODUCT_DEVICE := smb_a1002
-PRODUCT_MODEL := GTablet
-PRODUCT_MANUFACTURER := malata
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=smb_a1002 BUILD_ID=GRJ22 BUILD_FINGERPRINT=google/passion/passion:2.3.4/GRJ22/121341:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.3.4 GRJ22 121341 release-keys"
-
-# Extra overlay
-PRODUCT_PACKAGE_OVERLAYS += \
-    vendor/cyanogen/overlay/tablet \
-    vendor/cyanogen/overlay/smb_a1002
-
-# Release name and versioning
-PRODUCT_RELEASE_NAME := smb_a1002
-PRODUCT_VERSION_DEVICE_SPECIFIC :=
--include vendor/cyanogen/products/common_versions.mk
-
-#
-# Copy passion specific prebuilt files
-#
-PRODUCT_COPY_FILES +=  \
-    vendor/cyanogen/prebuilt/mdpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/products/cyanogen_smb_a1004.mk b/products/cyanogen_smb_a1004.mk
deleted file mode 100644
index 3f4be7a..0000000
--- a/products/cyanogen_smb_a1004.mk
+++ /dev/null
@@ -1,30 +0,0 @@
-$(call inherit-product, device/malata/smb_a1004/smb_a1004.mk)
-
-# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common_full.mk)
-
-#
-# Setup device specific product configuration.
-#
-PRODUCT_NAME := cyanogen_smb_a1004
-PRODUCT_BRAND := malata
-PRODUCT_DEVICE := smb_a1004
-PRODUCT_MODEL := SMB-A1004
-PRODUCT_MANUFACTURER := malata
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=smb_a1004 BUILD_ID=GRJ22 BUILD_FINGERPRINT=google/passion/passion:2.3.4/GRJ22/121341:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.3.4 GRJ22 121341 release-keys"
-
-# Extra overlay
-PRODUCT_PACKAGE_OVERLAYS += \
-    vendor/cyanogen/overlay/tablet \
-    vendor/cyanogen/overlay/smb_a1002
-
-# Release name and versioning
-PRODUCT_RELEASE_NAME := SMB-A1004
-PRODUCT_VERSION_DEVICE_SPECIFIC :=
--include vendor/cyanogen/products/common_versions.mk
-
-#
-# Copy passion specific prebuilt files
-#
-PRODUCT_COPY_FILES +=  \
-    vendor/cyanogen/prebuilt/hdpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/products/cyanogen_smb_a1011.mk b/products/cyanogen_smb_a1011.mk
deleted file mode 100644
index 05a53f5..0000000
--- a/products/cyanogen_smb_a1011.mk
+++ /dev/null
@@ -1,30 +0,0 @@
-$(call inherit-product, device/malata/smb_a1011/smb_a1011.mk)
-
-# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common_full.mk)
-
-#
-# Setup device specific product configuration.
-#
-PRODUCT_NAME := cyanogen_smb_a1011
-PRODUCT_BRAND := malata
-PRODUCT_DEVICE := smb_a1011
-PRODUCT_MODEL := SMB-A1011
-PRODUCT_MANUFACTURER := malata
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=smb_a1011 BUILD_ID=GRJ22 BUILD_FINGERPRINT=google/passion/passion:2.3.4/GRJ22/121341:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.3.4 GRJ22 121341 release-keys"
-
-# Extra overlay
-PRODUCT_PACKAGE_OVERLAYS += \
-    vendor/cyanogen/overlay/tablet \
-    vendor/cyanogen/overlay/smb_a1002
-
-# Release name and versioning
-PRODUCT_RELEASE_NAME := SMB-A1011
-PRODUCT_VERSION_DEVICE_SPECIFIC :=
--include vendor/cyanogen/products/common_versions.mk
-
-#
-# Copy passion specific prebuilt files
-#
-PRODUCT_COPY_FILES +=  \
-    vendor/cyanogen/prebuilt/hdpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/products/cyanogen_smb_b9701.mk b/products/cyanogen_smb_b9701.mk
deleted file mode 100644
index 4d451f9..0000000
--- a/products/cyanogen_smb_b9701.mk
+++ /dev/null
@@ -1,30 +0,0 @@
-$(call inherit-product, device/malata/smb_b9701/smb_b9701.mk)
-
-# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common_full.mk)
-
-#
-# Setup device specific product configuration.
-#
-PRODUCT_NAME := cyanogen_smb_b9701
-PRODUCT_BRAND := nvidia
-PRODUCT_DEVICE := smb_b9701
-PRODUCT_MODEL := Zpad-T8
-PRODUCT_MANUFACTURER := malata
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=smb_b9701 BUILD_ID=GRJ22 BUILD_FINGERPRINT=google/passion/passion:2.3.4/GRJ22/121341:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.3.4 GRJ22 121341 release-keys"
-
-# Extra overlay
-PRODUCT_PACKAGE_OVERLAYS += \
-    vendor/cyanogen/overlay/tablet \
-    vendor/cyanogen/overlay/smb_b9701
-
-# Release name and versioning
-PRODUCT_RELEASE_NAME := smb_b9701
-PRODUCT_VERSION_DEVICE_SPECIFIC :=
--include vendor/cyanogen/products/common_versions.mk
-
-#
-# Copy passion specific prebuilt files
-#
-PRODUCT_COPY_FILES +=  \
-    vendor/cyanogen/prebuilt/mdpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/products/cyanogen_smultron.mk b/products/cyanogen_smultron.mk
deleted file mode 100644
index 44e0768..0000000
--- a/products/cyanogen_smultron.mk
+++ /dev/null
@@ -1,44 +0,0 @@
-# Inherit device configuration for smultron.
-$(call inherit-product, device/semc/smultron/device_smultron.mk)
-
-# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common_full.mk)
-
-# Include GSM stuff
-$(call inherit-product, vendor/cyanogen/products/gsm.mk)
-
-#
-# Setup device specific product configuration.
-#
-PRODUCT_NAME := cyanogen_smultron
-PRODUCT_BRAND := SEMC
-PRODUCT_DEVICE := smultron
-PRODUCT_MODEL := ST15i
-PRODUCT_MANUFACTURER := Sony Ericsson
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=ST15i BUILD_ID=4.0.2.A.0.42 BUILD_FINGERPRINT=SEMC/ST15i_1249-6227/ST15i:2.3.4/4.0.2.A.0.42/j_b_3w:user/release-keys PRIVATE_BUILD_DESC="ST15i-user 2.3.4 4.0.2.A.0.42 j_b_3w test-keys"
-
-# Build kernel
-#PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=
-#PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_DIR=kernel-msm
-#PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_CONFIG=cyanogen_smultron_defconfig
-
-# Extra smultron overlay
-PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/smultron
-
-# Add the Torch app
-PRODUCT_PACKAGES += Torch
-
-
-# BCM FM radio
-#$(call inherit-product, vendor/cyanogen/products/bcm_fm_radio.mk)
-
-# Release name and versioning
-PRODUCT_RELEASE_NAME := XperiaMini-ST15i
-PRODUCT_VERSION_DEVICE_SPECIFIC :=
--include vendor/cyanogen/products/common_versions.mk
-
-#
-# Copy passion specific prebuilt files
-#
-PRODUCT_COPY_FILES +=  \
-    vendor/cyanogen/prebuilt/mdpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/products/cyanogen_speedy.mk b/products/cyanogen_speedy.mk
deleted file mode 100644
index 7aa420c..0000000
--- a/products/cyanogen_speedy.mk
+++ /dev/null
@@ -1,43 +0,0 @@
-# Inherit AOSP device configuration for speedy.
-$(call inherit-product, device/htc/speedy/speedy.mk)
-
-# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common_full.mk)
-
-# Inherit WiMAX stuff
-$(call inherit-product, vendor/cyanogen/products/wimax.mk)
-
-#
-# Setup device specific product configuration.
-#
-PRODUCT_NAME := cyanogen_speedy
-PRODUCT_BRAND := sprint
-PRODUCT_DEVICE := speedy
-PRODUCT_MODEL := PG06100
-PRODUCT_MANUFACTURER := HTC
-PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=GRI40 PRODUCT_NAME=htc_speedy BUILD_FINGERPRINT=sprint/htc_speedy/speedy:2.3.3/GRI40/74499:user/release-keys PRIVATE_BUILD_DESC="2.76.651.4 CL74499 release-keys"
-
-# Build kernel
-#PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=
-#PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_DIR=kernel-msm
-#PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_CONFIG=cyanogen_speedy_defconfig
-
-# Extra Supersonic overlay
-PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/speedy
-
-# Add the Torch app
-PRODUCT_PACKAGES += Torch
-
-# Broadcom FM radio
-$(call inherit-product, vendor/cyanogen/products/bcm_fm_radio.mk)
-
-# Release name and versioning
-PRODUCT_RELEASE_NAME := Speedy
-PRODUCT_VERSION_DEVICE_SPECIFIC :=
--include vendor/cyanogen/products/common_versions.mk
-
-#
-# Copy passion specific prebuilt files
-#
-PRODUCT_COPY_FILES +=  \
-    vendor/cyanogen/prebuilt/hdpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/products/cyanogen_supersonic.mk b/products/cyanogen_supersonic.mk
deleted file mode 100644
index 53099ed..0000000
--- a/products/cyanogen_supersonic.mk
+++ /dev/null
@@ -1,43 +0,0 @@
-# Inherit AOSP device configuration for supersonic.
-$(call inherit-product, device/htc/supersonic/supersonic.mk)
-
-# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common_full.mk)
-
-# Inherit WiMAX stuff
-$(call inherit-product, vendor/cyanogen/products/wimax.mk)
-
-#
-# Setup device specific product configuration.
-#
-PRODUCT_NAME := cyanogen_supersonic
-PRODUCT_BRAND := sprint
-PRODUCT_DEVICE := supersonic
-PRODUCT_MODEL := PC36100
-PRODUCT_MANUFACTURER := HTC
-PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=GRI40 PRODUCT_NAME=htc_supersonic BUILD_FINGERPRINT=sprint/htc_supersonic/supersonic:2.3.3/GRI40/61076:user/release-keys PRIVATE_BUILD_DESC="4.24.651.1 CL61076 release-keys"
-
-# Build kernel
-#PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=
-#PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_DIR=kernel-msm
-#PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_CONFIG=cyanogen_supersonic_defconfig
-
-# Extra Supersonic overlay
-PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/supersonic
-
-# Add the Torch app
-PRODUCT_PACKAGES += Torch
-
-# Broadcom FM radio
-$(call inherit-product, vendor/cyanogen/products/bcm_fm_radio.mk)
-
-# Release name and versioning
-PRODUCT_RELEASE_NAME := Supersonic
-PRODUCT_VERSION_DEVICE_SPECIFIC :=
--include vendor/cyanogen/products/common_versions.mk
-
-#
-# Copy passion specific prebuilt files
-#
-PRODUCT_COPY_FILES +=  \
-    vendor/cyanogen/prebuilt/hdpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/products/cyanogen_tass.mk b/products/cyanogen_tass.mk
deleted file mode 100644
index f8cfad8..0000000
--- a/products/cyanogen_tass.mk
+++ /dev/null
@@ -1,33 +0,0 @@
-# Inherit AOSP device configuration for tass
-$(call inherit-product, device/samsung/tass/device_tass.mk)
-
-# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common_full.mk)
-
-# Include GSM stuff
-$(call inherit-product, vendor/cyanogen/products/gsm.mk)
-
-#
-# Setup device specific product configuration.
-#
-PRODUCT_NAME := cyanogen_tass
-PRODUCT_BRAND := samsung_tass
-PRODUCT_DEVICE := tass
-PRODUCT_MODEL := GT-S5570
-PRODUCT_MANUFACTURER := samsung
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=GT-S5570 BUILD_ID=GRI40 BUILD_DISPLAY_ID=GWK74 BUILD_FINGERPRINT=samsung/GT-S5570/GT-S5570:2.3.4/GINGERBREAD/XXKPI:user/release-keys PRIVATE_BUILD_DESC="GT-S5570-user 2.3.4 GINGERBREAD XXKPI release-keys"
-
-# Add LDPI assets, in addition to MDPI
-PRODUCT_LOCALES += ldpi mdpi
-
-# Extra overlay for LDPI
-PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/ldpi
-
-# Copy bootanimation
-PRODUCT_COPY_FILES +=  \
-    vendor/cyanogen/prebuilt/ldpi/media/bootanimation.zip:system/media/bootanimation.zip
-
-# Release name and versioning
-PRODUCT_RELEASE_NAME := GalaxyMini
-PRODUCT_VERSION_DEVICE_SPECIFIC :=
--include vendor/cyanogen/products/common_versions.mk
diff --git a/products/cyanogen_u8150.mk b/products/cyanogen_u8150.mk
deleted file mode 100644
index a28cdbf..0000000
--- a/products/cyanogen_u8150.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-# Inherit AOSP device configuration for U8150.
-$(call inherit-product, device/huawei/u8150/device_u8150.mk)
-
-# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common_full.mk)
-
-# Include GSM stuff
-$(call inherit-product, vendor/cyanogen/products/gsm.mk)
-
-#
-# Setup device specific product configuration.
-#
-PRODUCT_NAME := cyanogen_u8150
-PRODUCT_BRAND := huawei
-PRODUCT_DEVICE := u8150
-PRODUCT_MODEL := U8150
-PRODUCT_MANUFACTURER := Huawei
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=u8150 BUILD_ID=GRK39F BUILD_DISPLAY_ID=GWK74 BUILD_FINGERPRINT=google/passion/passion:2.3.6/GRK39F/189904:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.3.6 GRK39F 189904 release-keys"
-
-# Extra LDPI overlay
-PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/ldpi
-
-# Release name and versioning
-PRODUCT_RELEASE_NAME := U8150
-PRODUCT_VERSION_DEVICE_SPECIFIC :=
--include vendor/cyanogen/products/common_versions.mk
-
-PRODUCT_COPY_FILES +=  \
-     vendor/cyanogen/prebuilt/ldpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/products/cyanogen_u8220.mk b/products/cyanogen_u8220.mk
deleted file mode 100644
index 543bcba..0000000
--- a/products/cyanogen_u8220.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-# Inherit AOSP device configuration for dream_sapphire.
-$(call inherit-product, device/huawei/u8220/device_u8220.mk)
-
-# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common.mk)
-
-# Include GSM-only stuff
-$(call inherit-product, vendor/cyanogen/products/gsm.mk)
-
-#
-# Setup device specific product configuration.
-#
-PRODUCT_NAME := cyanogen_u8220
-PRODUCT_BRAND := huawei
-PRODUCT_DEVICE := u8220
-PRODUCT_MODEL := U8220/U8230
-PRODUCT_MANUFACTURER := Huawei
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=u8220 BUILD_ID=GRJ22 BUILD_FINGERPRINT=google/passion/passion:2.3.4/GRJ22/121341:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.3.4 GRJ22 121341 release-keys"
-
-# Release name and versioning
-PRODUCT_RELEASE_NAME := U8220
-PRODUCT_VERSION_DEVICE_SPECIFIC :=
--include vendor/cyanogen/products/common_versions.mk
-
-#
-# Copy DS specific prebuilt files
-#
-PRODUCT_COPY_FILES +=  \
-    vendor/cyanogen/prebuilt/mdpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/products/cyanogen_urushi.mk b/products/cyanogen_urushi.mk
deleted file mode 100644
index 97218b7..0000000
--- a/products/cyanogen_urushi.mk
+++ /dev/null
@@ -1,44 +0,0 @@
-# Inherit device configuration for urushi.
-$(call inherit-product, device/semc/urushi/device_urushi.mk)
-
-# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common_full.mk)
-
-# Include GSM stuff
-$(call inherit-product, vendor/cyanogen/products/gsm.mk)
-
-#
-# Setup device specific product configuration.
-#
-PRODUCT_NAME := cyanogen_urushi
-PRODUCT_BRAND := SEMC
-PRODUCT_DEVICE := urushi
-PRODUCT_MODEL := ST18i
-PRODUCT_MANUFACTURER := Sony Ericsson
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=ST18i BUILD_ID=4.0.A.2.368 BUILD_FINGERPRINT=SEMC/ST18i_1247-1061/ST18i:2.3.3/3.0.1.A.0.145/bn_P:user/release-keys PRIVATE_BUILD_DESC="ST18i-user 2.3.3 3.0.1.A.0.145 bn_P test-keys"
-
-# Build kernel
-#PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=
-#PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_DIR=kernel-msm
-#PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_CONFIG=cyanogen_urushi_defconfig
-
-# Extra urushi overlay
-PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/urushi
-
-# Add the Torch app
-PRODUCT_PACKAGES += Torch
-
-
-# BCM FM radio
-#$(call inherit-product, vendor/cyanogen/products/bcm_fm_radio.mk)
-
-# Release name and versioning
-PRODUCT_RELEASE_NAME := XperiaRay-ST18i
-PRODUCT_VERSION_DEVICE_SPECIFIC :=
--include vendor/cyanogen/products/common_versions.mk
-
-#
-# Copy passion specific prebuilt files
-#
-PRODUCT_COPY_FILES +=  \
-    vendor/cyanogen/prebuilt/hdpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/products/cyanogen_v9.mk b/products/cyanogen_v9.mk
deleted file mode 100644
index 110439e..0000000
--- a/products/cyanogen_v9.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-# Inherit AOSP device configuration for v9.
-$(call inherit-product, device/zte/v9/device_v9.mk)
-
-# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common_full.mk)
-
-# Include GSM stuff
-$(call inherit-product, vendor/cyanogen/products/gsm.mk)
-
-#
-# Setup device specific product configuration.
-#
-PRODUCT_NAME := cyanogen_v9
-PRODUCT_BRAND := zte
-PRODUCT_DEVICE := v9
-PRODUCT_MODEL := V9
-PRODUCT_MANUFACTURER := ZTE
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=v9 BUILD_ID=GRJ22 BUILD_FINGERPRINT=google/passion/passion:2.3.4/GRJ22/121341:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.3.4 GRJ22 121341 release-keys"
-
-# Release name and versioning
-PRODUCT_RELEASE_NAME := V9
-PRODUCT_VERSION_DEVICE_SPECIFIC :=
--include vendor/cyanogen/products/common_versions.mk
-
-#
-# Copy legend specific prebuilt files
-#
-PRODUCT_COPY_FILES +=  \
-    vendor/cyanogen/prebuilt/hdpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/products/cyanogen_vega.mk b/products/cyanogen_vega.mk
deleted file mode 100644
index bbfd306..0000000
--- a/products/cyanogen_vega.mk
+++ /dev/null
@@ -1,30 +0,0 @@
-$(call inherit-product, device/advent/vega/vega.mk)
-
-# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common.mk)
-
-#
-# Setup device specific product configuration.
-#
-PRODUCT_NAME := cyanogen_vega
-PRODUCT_BRAND := advent
-PRODUCT_DEVICE := vega
-PRODUCT_MODEL := Vega
-PRODUCT_MANUFACTURER := Advent
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=Vega BUILD_ID=GRJ22 BUILD_FINGERPRINT=google/passion/passion:2.3.4/GRJ22/121341:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.3.4 GRJ22 121341 release-keys" BUILD_NUMBER=121341
-
-# Extra overlay
-PRODUCT_PACKAGE_OVERLAYS += \
-    vendor/cyanogen/overlay/tablet \
-    vendor/cyanogen/overlay/vega
-
-# Release name and versioning
-PRODUCT_RELEASE_NAME := Vega
-PRODUCT_VERSION_DEVICE_SPECIFIC :=
--include vendor/cyanogen/products/common_versions.mk
-
-#
-# Copy Vega specific prebuilt files
-#
-PRODUCT_COPY_FILES +=  \
-    vendor/cyanogen/prebuilt/mdpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/products/cyanogen_vibrantmtd.mk b/products/cyanogen_vibrantmtd.mk
deleted file mode 100644
index 99ba6f2..0000000
--- a/products/cyanogen_vibrantmtd.mk
+++ /dev/null
@@ -1,51 +0,0 @@
-# Inherit AOSP device configuration for vibrantmtd.
-$(call inherit-product, device/samsung/vibrantmtd/full_vibrantmtd.mk)
-
-# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common_full.mk)
-
-# Include GSM stuff
-$(call inherit-product, vendor/cyanogen/products/gsm.mk)
-
-#
-# Setup device specific product configuration.
-#
-PRODUCT_NAME := cyanogen_vibrantmtd
-PRODUCT_BRAND := samsung
-PRODUCT_DEVICE := vibrantmtd
-PRODUCT_MODEL := SGH-T959
-PRODUCT_MANUFACTURER := Samsung
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=soju BUILD_ID=GRJ22 BUILD_FINGERPRINT=google/soju/crespo:2.3.4/GRJ22/121341:user/release-keys PRIVATE_BUILD_DESC="soju-user 2.3.4 GRJ22 121341 release-keys"
-
-# Build kernel
-#PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=
-#PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_DIR=kernel-samsung
-#PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_CONFIG=cyanogen_vibrantmtd_defconfig
-
-# Extra galaxys overlay
-PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/vibrantmtd
-
-# Add the FM app
-# PRODUCT_PACKAGES += FM
-
-# Extra RIL settings
-PRODUCT_PROPERTY_OVERRIDES += \
-    ro.ril.enable.managed.roaming=1 \
-    ro.ril.oem.nosim.ecclist=911,112,999,000,08,118,120,122,110,119,995 \
-    ro.ril.emc.mode=2
-
-# Add additional mounts
-PRODUCT_PROPERTY_OVERRIDES += \
-    ro.additionalmounts=/mnt/emmc \
-    ro.vold.switchablepair=/mnt/sdcard,/mnt/emmc
-
-# Release name and versioning
-PRODUCT_RELEASE_NAME := Vibrant
-PRODUCT_VERSION_DEVICE_SPECIFIC :=
--include vendor/cyanogen/products/common_versions.mk
-
-#
-# Copy galaxys specific prebuilt files
-#
-PRODUCT_COPY_FILES +=  \
-    vendor/cyanogen/prebuilt/hdpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/products/cyanogen_vision.mk b/products/cyanogen_vision.mk
deleted file mode 100644
index 14527c8..0000000
--- a/products/cyanogen_vision.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-# Inherit device configuration for vision.
-$(call inherit-product, device/htc/vision/vision.mk)
-
-# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common_full.mk)
-
-# Include GSM stuff
-$(call inherit-product, vendor/cyanogen/products/gsm.mk)
-
-#
-# Setup device specific product configuration.
-#
-PRODUCT_NAME := cyanogen_vision
-PRODUCT_BRAND := htc_wwe
-PRODUCT_DEVICE := vision
-PRODUCT_MODEL := HTC Vision
-PRODUCT_MANUFACTURER := HTC
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=htc_vision BUILD_ID=GRI40 BUILD_FINGERPRINT=htc_wwe/htc_vision/vision:2.3.3/GRI40/84109:user/release-keys PRIVATE_BUILD_DESC="2.42.405.2 CL84109 release-keys"
-
-PRODUCT_SPECIFIC_DEFINES = WEBCORE_ACCELERATED_SCROLLING=true
-
-# Build kernel
-#PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=
-#PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_DIR=kernel-msm
-#PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_CONFIG=cyanogen_vision_defconfig
-
-# Extra Vision overlay
-PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/vision
-
-# Add the Torch app
-PRODUCT_PACKAGES += Torch
-
-# Build GanOptimizer
-PRODUCT_PACKAGES += GanOptimizer
-
-# Broadcom FM radio
-$(call inherit-product, vendor/cyanogen/products/bcm_fm_radio.mk)
-
-# Release name and versioning
-PRODUCT_RELEASE_NAME := vision
-PRODUCT_VERSION_DEVICE_SPECIFIC :=
--include vendor/cyanogen/products/common_versions.mk
-
-#
-# Copy passion specific prebuilt files
-#
-PRODUCT_COPY_FILES +=  \
-    vendor/cyanogen/prebuilt/hdpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/products/cyanogen_vivo.mk b/products/cyanogen_vivo.mk
deleted file mode 100644
index cfabd40..0000000
--- a/products/cyanogen_vivo.mk
+++ /dev/null
@@ -1,43 +0,0 @@
-# Inherit device configuration for vivo.
-$(call inherit-product, device/htc/vivo/vivo.mk)
-
-# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common_full.mk)
-
-# Include GSM stuff
-$(call inherit-product, vendor/cyanogen/products/gsm.mk)
-
-#
-# Setup device specific product configuration.
-#
-PRODUCT_NAME := cyanogen_vivo
-PRODUCT_BRAND := htc_wwe
-PRODUCT_DEVICE := vivo
-PRODUCT_MODEL := Incredible S
-PRODUCT_MANUFACTURER := HTC
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=htc_vivo BUILD_ID=GRI40 BUILD_FINGERPRINT=htc_wwe/htc_vivo/vivo:2.3.3/GRI40/88716:user/release-keys PRIVATE_BUILD_DESC="2.30.405.1 CL88716 release-keys"
-
-# Build kernel
-#PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=
-#PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_DIR=kernel-msm
-#PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_CONFIG=cyanogen_vivo_defconfig
-
-# Extra vivo overlay
-PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/vivo
-
-# Add the Torch app
-PRODUCT_PACKAGES += Torch
-
-# Broadcom FM radio
-$(call inherit-product, vendor/cyanogen/products/bcm_fm_radio.mk)
-
-# Release name and versioning
-PRODUCT_RELEASE_NAME := IncS
-PRODUCT_VERSION_DEVICE_SPECIFIC :=
--include vendor/cyanogen/products/common_versions.mk
-
-#
-# Copy passion specific prebuilt files
-#
-PRODUCT_COPY_FILES +=  \
-    vendor/cyanogen/prebuilt/hdpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/products/cyanogen_vivow.mk b/products/cyanogen_vivow.mk
deleted file mode 100644
index 60ffd08..0000000
--- a/products/cyanogen_vivow.mk
+++ /dev/null
@@ -1,40 +0,0 @@
-# Inherit device configuration for vivow.
-$(call inherit-product, device/htc/vivow/vivow.mk)
-
-# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common_full.mk)
-
-#
-# Setup device specific product configuration.
-#
-PRODUCT_NAME := cyanogen_vivow
-PRODUCT_BRAND := verizon_wwe
-PRODUCT_DEVICE := vivow
-PRODUCT_MODEL := Incredible 2
-PRODUCT_MANUFACTURER := HTC
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=htc_vivow BUILD_ID=GRI40 BUILD_FINGERPRINT=verizon_wwe/htc_vivow/vivow:2.3.3/GRI40/81006:user/release-keys PRIVATE_BUILD_DESC="2.18.605.4 CL81006 release-keys"
-
-# Build kernel
-#PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=
-#PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_DIR=kernel-msm
-#PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_CONFIG=cyanogen_vivow_defconfig
-
-# Extra vivow overlay
-PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/vivow
-
-# Add the Torch app
-PRODUCT_PACKAGES += Torch
-
-# Broadcom FM radio
-$(call inherit-product, vendor/cyanogen/products/bcm_fm_radio.mk)
-
-# Release name and versioning
-PRODUCT_RELEASE_NAME := Inc2
-PRODUCT_VERSION_DEVICE_SPECIFIC :=
--include vendor/cyanogen/products/common_versions.mk
-
-#
-# Copy passion specific prebuilt files
-#
-PRODUCT_COPY_FILES +=  \
-    vendor/cyanogen/prebuilt/hdpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/products/cyanogen_z71.mk b/products/cyanogen_z71.mk
deleted file mode 100644
index cad37de..0000000
--- a/products/cyanogen_z71.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-# Inherit AOSP device configuration for z71.
-$(call inherit-product, device/commtiva/z71/device_z71.mk)
-
-# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common_full.mk)
-
-# Include GSM stuff
-$(call inherit-product, vendor/cyanogen/products/gsm.mk)
-
-#
-# Setup device specific product configuration.
-#
-PRODUCT_NAME := cyanogen_z71
-PRODUCT_BRAND := commtiva
-PRODUCT_DEVICE := z71
-PRODUCT_MODEL := Z71
-PRODUCT_MANUFACTURER := Commtiva
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=commtiva_z71 BUILD_ID=GRJ22 BUILD_FINGERPRINT=google/passion/passion:2.3.4/GRJ22/121341:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.3.4 GRJ22 121341 release-keys"
-
-#PRODUCT_SPECIFIC_DEFINES += TARGET_PRELINKER_MAP=$(TOP)/vendor/cyanogen/prelink-linux-arm-z71.map
-
-# Release name and versioning
-PRODUCT_RELEASE_NAME := Z71
-PRODUCT_VERSION_DEVICE_SPECIFIC :=
--include vendor/cyanogen/products/common_versions.mk
-
-#
-# Copy legend specific prebuilt files
-#
-PRODUCT_COPY_FILES +=  \
-    vendor/cyanogen/prebuilt/mdpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/products/cyanogen_zeppelin.mk b/products/cyanogen_zeppelin.mk
deleted file mode 100644
index 8188bf1..0000000
--- a/products/cyanogen_zeppelin.mk
+++ /dev/null
@@ -1,33 +0,0 @@
-# Inherit AOSP device configuration for zeppelin.
-$(call inherit-product, device/motorola/zeppelin/zeppelin.mk)
-
-# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common_full.mk)
-
-$(call inherit-product vendor/cyanogen/products/bcm_fm_radio.mk)
-
-$(call inherit-product, vendor/cyanogen/products/gsm.mk)
-
-#
-# Setup device specific product configuration.
-#
-PRODUCT_NAME := cyanogen_zeppelin
-PRODUCT_BRAND := motorola
-PRODUCT_DEVICE := zeppelin
-PRODUCT_MODEL := MB501
-PRODUCT_MANUFACTURER := Motorola
-
-# Release name and versioning
-PRODUCT_RELEASE_NAME := CLIQXT
-PRODUCT_VERSION_DEVICE_SPECIFIC :=
--include vendor/cyanogen/products/common_versions.mk
-
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=zeppelin TARGET_DEVICE=zeppelin BUILD_ID=GRJ22 BUILD_FINGERPRINT=google/soju/crespo:2.3.4/GRJ22/121341:user/release-keys PRIVATE_BUILD_DESC="soju-user 2.3.4 GRJ22 121341 release-keys" BUILD_NUMBER=121341
-
-PRODUCT_COPY_FILES +=  \
-    vendor/cyanogen/prebuilt/mdpi/media/bootanimation.zip:system/media/bootanimation.zip
-
-PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/zeppelin
-
-# Add the FM app
-PRODUCT_PACKAGES += FM
diff --git a/products/cyanogen_zero.mk b/products/cyanogen_zero.mk
deleted file mode 100644
index 5b40a6a..0000000
--- a/products/cyanogen_zero.mk
+++ /dev/null
@@ -1,30 +0,0 @@
-# Inherit AOSP device configuration for zero.
-$(call inherit-product, device/geeksphone/zero/zero.mk)
-
-# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common_full.mk)
-
-# Include GSM stuff
-$(call inherit-product, vendor/cyanogen/products/gsm.mk)
-
-#
-# Setup device specific product configuration.
-#
-PRODUCT_NAME := cyanogen_zero
-PRODUCT_BRAND := geeksphone
-PRODUCT_DEVICE := zero
-PRODUCT_MODEL := Geeksphone ZERO
-PRODUCT_MANUFACTURER := Geeksphone
-
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=geeksphone_zero BUILD_ID=FRG83 BUILD_FINGERPRINT=qcom/msm7627_ffa/msm7627_ffa/7x27:2.2.1/FRG83/eng.SIMCOM.20110314.124514:user/test-keys PRIVATE_BUILD_DESC="msm7627_ffa-user 2.2.1 FRG83 eng.SIMCOM.20110314.124514 test-keys"
-
-# Release name and versioning
-PRODUCT_RELEASE_NAME := ZERO
-PRODUCT_VERSION_DEVICE_SPECIFIC :=
--include vendor/cyanogen/products/common_versions.mk
-
-#
-# Copy legend specific prebuilt files
-#
-PRODUCT_COPY_FILES +=  \
-    vendor/cyanogen/prebuilt/mdpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/products/cyanogen_zeus.mk b/products/cyanogen_zeus.mk
deleted file mode 100644
index 151cce9..0000000
--- a/products/cyanogen_zeus.mk
+++ /dev/null
@@ -1,44 +0,0 @@
-# Inherit device configuration for zeus.
-$(call inherit-product, device/semc/zeus/device_zeus.mk)
-
-# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common_full.mk)
-
-# Include GSM stuff
-$(call inherit-product, vendor/cyanogen/products/gsm.mk)
-
-#
-# Setup device specific product configuration.
-#
-PRODUCT_NAME := cyanogen_zeus
-PRODUCT_BRAND := SEMC
-PRODUCT_DEVICE := zeus
-PRODUCT_MODEL := R800i
-PRODUCT_MANUFACTURER := Sony Ericsson
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=Play BUILD_ID=4.0.2.A.0.42 BUILD_FINGERPRINT=SEMC/R800i_1247-6199/R800i:2.3.4/4.0.2.A.0.42/bn_p:user/release-keys PRIVATE_BUILD_DESC="LT15i-user 2.3.4 4.0.2.A.0.42 bn_P test-keys"
-
-# Build kernel
-#PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=
-#PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_DIR=kernel-msm
-#PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_CONFIG=cyanogen_zeus_defconfig
-
-# Extra zeus overlay
-PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/zeus
-
-# Add the Torch app
-PRODUCT_PACKAGES += Torch
-
-
-# BCM FM radio
-#$(call inherit-product, vendor/cyanogen/products/bcm_fm_radio.mk)
-
-# Release name and versioning
-PRODUCT_RELEASE_NAME := XperiaPlay-R800i
-PRODUCT_VERSION_DEVICE_SPECIFIC :=
--include vendor/cyanogen/products/common_versions.mk
-
-#
-# Copy passion specific prebuilt files
-#
-PRODUCT_COPY_FILES +=  \
-    vendor/cyanogen/prebuilt/hdpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/products/cyanogen_zeusc.mk b/products/cyanogen_zeusc.mk
deleted file mode 100644
index 07037a3..0000000
--- a/products/cyanogen_zeusc.mk
+++ /dev/null
@@ -1,42 +0,0 @@
-# Inherit device configuration for zeusc.
-$(call inherit-product, device/semc/zeusc/device_zeusc.mk)
-
-# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common_full.mk)
-
-
-#
-# Setup device specific product configuration.
-#
-PRODUCT_NAME := cyanogen_zeusc
-PRODUCT_BRAND := SEMC
-PRODUCT_DEVICE := zeusc
-PRODUCT_MODEL := R800x
-PRODUCT_MANUFACTURER := Sony Ericsson
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=Play BUILD_ID=3.0.1.A.0.145 BUILD_FINGERPRINT=SEMC/R800i_1247-6199/R800i:2.3.3/3.0.1.A.0.145/bn_p:user/release-keys PRIVATE_BUILD_DESC="LT15i-user 2.3.3 3.0.1.A.0.145 bn_P test-keys"
-
-# Build kernel
-#PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=
-#PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_DIR=kernel-msm
-#PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_CONFIG=cyanogen_zeus_defconfig
-
-# Extra zeus overlay
-PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/zeusc
-
-# Add the Torch app
-#PRODUCT_PACKAGES += Torch
-
-
-# BCM FM radio
-#$(call inherit-product, vendor/cyanogen/products/bcm_fm_radio.mk)
-
-# Release name and versioning
-PRODUCT_RELEASE_NAME := XperiaPlayCDMA-R800x
-PRODUCT_VERSION_DEVICE_SPECIFIC :=
--include vendor/cyanogen/products/common_versions.mk
-
-#
-# Copy passion specific prebuilt files
-#
-PRODUCT_COPY_FILES +=  \
-    vendor/cyanogen/prebuilt/hdpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/products/gsm.mk b/products/gsm.mk
deleted file mode 100644
index bdee80a..0000000
--- a/products/gsm.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-# GSM APN list
-PRODUCT_COPY_FILES += \
-    vendor/cyanogen/prebuilt/common/etc/apns-conf.xml:system/etc/apns-conf.xml
-
-# GSM SPN overrides list
-PRODUCT_COPY_FILES += \
-    vendor/cyanogen/prebuilt/common/etc/spn-conf.xml:system/etc/spn-conf.xml
-
-# SIM Toolkit
-PRODUCT_PACKAGES += \
-    Stk
diff --git a/products/themes.mk b/products/themes.mk
deleted file mode 100644
index 39d6ffa..0000000
--- a/products/themes.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-# Theme packages
-PRODUCT_PACKAGES += \
-       Androidian \
-       Cyanbread
diff --git a/products/themes_common.mk b/products/themes_common.mk
deleted file mode 100644
index 9f3964b..0000000
--- a/products/themes_common.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-# T-Mobile theme engine
-PRODUCT_PACKAGES += \
-       ThemeManager \
-       ThemeChooser \
-       com.tmobile.themes
-
-PRODUCT_COPY_FILES += \
-       vendor/cyanogen/prebuilt/common/etc/permissions/com.tmobile.software.themes.xml:system/etc/permissions/com.tmobile.software.themes.xml
-
diff --git a/products/ti_fm_radio.mk b/products/ti_fm_radio.mk
deleted file mode 100644
index 7f91740..0000000
--- a/products/ti_fm_radio.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-# TI FM Radio
-PRODUCT_PACKAGES += \
-    FM \
-    hcitool
diff --git a/products/wimax.mk b/products/wimax.mk
deleted file mode 100644
index cf1aff1..0000000
--- a/products/wimax.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-# Required packages for WiMAX
-PRODUCT_PACKAGES += CMWimaxSettings
diff --git a/tools/opticharger b/tools/opticharger
index b4345c4..c8c86f5 100755
--- a/tools/opticharger
+++ b/tools/opticharger
@@ -20,10 +20,20 @@
 set -e
 QUIET=1
 BASE=`pwd`
+BRUTECRUSH="-brute"
 TMPDIR=/tmp/opticharge-$$
 
+if [ -z "$BRUTE_PNGCRUSH" ]
+then
+    BRUTECRUSH=""
+fi
+
 if [ "$APKCERTS" = "" ];
 then
+    if [ "$TARGET_BUILD_VARIANT" = "userdebug" ]; then
+       TARGET_BUILD_VARIANT="eng"
+    fi
+
     APKCERTS=$OUT/obj/PACKAGING/target_files_intermediates/$TARGET_PRODUCT-target_files-$TARGET_BUILD_VARIANT.$USER/META/apkcerts.txt
     if [ ! -f "$APKCERTS" ];
     then
@@ -40,7 +50,7 @@
 if [ "$(which pngcrush)" != "" ];
 then
     optimize_png () {
-        pngcrush -q -brute $1 ${1}.out 1> /dev/null 2> /dev/null
+        pngcrush -q ${BRUTECRUSH} $1 ${1}.out 1> /dev/null 2> /dev/null
         mv ${1}.out ${1}
     }
 elif [ "$(which optipng)" != "" ];
diff --git a/tools/squisher b/tools/squisher
index c82443f..b511936 100755
--- a/tools/squisher
+++ b/tools/squisher
@@ -25,6 +25,8 @@
 
 if [ "$TARGET_BUILD_TYPE" = "debug" ]; then
     OTAPACKAGE=$OUT/${TARGET_PRODUCT}_debug-ota-$TARGET_BUILD_VARIANT.$USER.zip
+elif [ "$TARGET_BUILD_VARIANT" = "userdebug" ]; then
+    OTAPACKAGE=$OUT/$TARGET_PRODUCT-ota-eng.$USER.zip
 else
     OTAPACKAGE=$OUT/$TARGET_PRODUCT-ota-$TARGET_BUILD_VARIANT.$USER.zip
 fi
@@ -33,7 +35,7 @@
 	exit 1
 fi
 
-OPTICHARGER=$ANDROID_BUILD_TOP/vendor/cyanogen/tools/opticharger
+OPTICHARGER=$ANDROID_BUILD_TOP/vendor/cm/tools/opticharger
 QUIET=-q
 DELETE_BINS="applypatch applypatch_static check_prereq recovery updater"
 
diff --git a/vendorsetup.sh b/vendorsetup.sh
index 7582d83..26a44b1 100644
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -1,76 +1,4 @@
-#add_lunch_combo cyanogen_ace-eng
-#add_lunch_combo cyanogen_anzu-eng
-#add_lunch_combo cyanogen_blade-eng
-#add_lunch_combo cyanogen_bravo-eng
-#add_lunch_combo cyanogen_bravoc-eng
-#add_lunch_combo cyanogen_buzz-eng
-#add_lunch_combo cyanogen_click-eng
-#add_lunch_combo cyanogen_captivatemtd-eng
-#add_lunch_combo cyanogen_coconut-eng
-#add_lunch_combo cyanogen_cooper-eng
-add_lunch_combo cyanogen_crespo-eng
-#add_lunch_combo cyanogen_crespo4g-eng
-#add_lunch_combo cyanogen_desirec-eng
-#add_lunch_combo cyanogen_dream_sapphire-eng
-#add_lunch_combo cyanogen_droid2-eng
-#add_lunch_combo cyanogen_droid2we-eng
-#add_lunch_combo cyanogen_encore-eng
-#add_lunch_combo cyanogen_es209ra-eng
-#add_lunch_combo cyanogen_espresso-eng
-#add_lunch_combo cyanogen_fascinatemtd-eng
-#add_lunch_combo cyanogen_galaxys2-eng
-#add_lunch_combo cyanogen_galaxys2att-eng
-#add_lunch_combo cyanogen_galaxysmtd-eng
-#add_lunch_combo cyanogen_generic-eng
-#add_lunch_combo cyanogen_glacier-eng
-#add_lunch_combo cyanogen_hallon-eng
-#add_lunch_combo cyanogen_hero-eng
-#add_lunch_combo cyanogen_heroc-eng
-#add_lunch_combo cyanogen_inc-eng
-#add_lunch_combo cyanogen_iyokan-eng
-#add_lunch_combo cyanogen_jordan-eng
-#add_lunch_combo cyanogen_legend-eng
-#add_lunch_combo cyanogen_leo-eng
-#add_lunch_combo cyanogen_liberty-eng
-#add_lunch_combo cyanogen_mango-eng
-#add_lunch_combo cyanogen_mecha-eng
-#add_lunch_combo cyanogen_mesmerizemtd-eng
-#add_lunch_combo cyanogen_mimmi-eng
-#add_lunch_combo cyanogen_morrison-eng
-#add_lunch_combo cyanogen_motus-eng
-#add_lunch_combo cyanogen_one-eng
-#add_lunch_combo cyanogen_olympus-eng
-#add_lunch_combo cyanogen_p970-eng
-#add_lunch_combo cyanogen_p990-eng
-#add_lunch_combo cyanogen_p999-eng
-#add_lunch_combo cyanogen_passion-eng
-#add_lunch_combo cyanogen_robyn-eng
-#add_lunch_combo cyanogen_saga-eng
-#add_lunch_combo cyanogen_satsuma-eng
-#add_lunch_combo cyanogen_shadow-eng
-#add_lunch_combo cyanogen_shakira-eng
-#add_lunch_combo cyanogen_sholes-eng
-#add_lunch_combo cyanogen_showcasemtd-eng
-#add_lunch_combo cyanogen_smb_a1002-eng
-#add_lunch_combo cyanogen_smb_a1004-eng
-#add_lunch_combo cyanogen_smb_a1011-eng
-#add_lunch_combo cyanogen_smb_b9701-eng
-#add_lunch_combo cyanogen_smultron-eng
-#add_lunch_combo cyanogen_speedy-eng
-#add_lunch_combo cyanogen_supersonic-eng
-#add_lunch_combo cyanogen_tass-eng
-#add_lunch_combo cyanogen_u8150-eng
-#add_lunch_combo cyanogen_u8220-eng
-#add_lunch_combo cyanogen_urushi-eng
-#add_lunch_combo cyanogen_v9-eng
-#add_lunch_combo cyanogen_vega-eng
-#add_lunch_combo cyanogen_vibrantmtd-eng
-#add_lunch_combo cyanogen_vision-eng
-#add_lunch_combo cyanogen_vivo-eng
-#add_lunch_combo cyanogen_vivow-eng
-#add_lunch_combo cyanogen_z71-eng
-#add_lunch_combo cyanogen_zeppelin-eng
-#add_lunch_combo cyanogen_zero-eng
-#add_lunch_combo cyanogen_zeus-eng
-#add_lunch_combo cyanogen_zeusc-eng
-
+add_lunch_combo cm_p920-userdebug
+add_lunch_combo cm_p990-userdebug
+add_lunch_combo cm_p999-userdebug
+add_lunch_combo cm_crespo-userdebug