diff --git a/default.xml b/default.xml
index 9a2d844407e..ef842e5d733 100644
--- a/default.xml
+++ b/default.xml
@@ -1,50 +1,50 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
   <remote  name="korg"
-           fetch="git://android.git.kernel.org/"
+           fetch="git://codeaurora.org/"
            review="review.source.android.com" />
   <remote name="github" fetch="git://github.com/" review="review.cyanogenmod.com" />
   <default revision="froyo"
            remote="korg" />
 
-  <project path="build" name="drakaz/gaosp_android_build" remote="github" revision="gaosp-froyo"> 
+  <project path="build" name="liudidi/deprecated_gaosp_android_build" remote="github" revision="gaosp-froyo"> 
     <copyfile src="core/root.mk" dest="Makefile" />
   </project>
 
-  <project path="bionic" name="CyanogenMod/android_bionic" remote="github" revision="froyo-stable"/>
+  <project path="bionic" name="liudidi/android_bionic" remote="github" revision="froyo-stable"/>
 
   <project path="bootable/bootloader/legacy" name="platform/bootable/bootloader/legacy" />
   <project path="bootable/diskinstaller" name="platform/bootable/diskinstaller" />
-  <project path="bootable/recovery" name="drakaz/android_bootable_recovery_galaxy" remote="github" revision="gaosp" />
+  <project path="bootable/recovery" name="liudidi/android_bootable_recovery_galaxy" remote="github" revision="gaosp" />
 
-  <project path="dalvik" name="CyanogenMod/android_dalvik" remote="github" revision="froyo-stable"/>
-  <project path="development" name="CyanogenMod/android_development" remote="github" revision="froyo-stable"/>
+  <project path="dalvik" name="liudidi/android_dalvik" remote="github" revision="froyo-stable"/>
+  <project path="development" name="liudidi/android_development" remote="github" revision="froyo-stable"/>
 
   <project path="device/common" name="device/common" />
-  <project path="device/generic" name="CyanogenMod/android_device_generic" remote="github" revision="froyo-stable"/>
+  <project path="device/generic" name="liudidi/android_device_generic" remote="github" revision="froyo-stable"/>
   <project path="device/sample" name="device/sample" />
-  <project path="device/Samsung/I7500" name="drakaz/gaosp_vendor" remote="github" revision="gaosp-froyo"/>
+  <project path="device/Samsung/I7500" name="liudidi/gaosp_vendor" remote="github" revision="gaosp-froyo"/>
 
-  <project path="external/alsa-lib" name="platform/external/alsa-lib" revision="master" />
-  <project path="external/alsa-utils" name="platform/external/alsa-utils" revision="master" />
+  <project path="external/alsa-lib" name="liudidi/android_external_alsa-lib" remote="github" revision="master" />
+  <project path="external/alsa-utils" name="liudidi/android_external_alsa-utils" remote="github" revision="master" />
   <project path="external/apache-http" name="platform/external/apache-http" revision="master" />
   <project path="external/astl" name="platform/external/astl" />
-  <project path="external/bash" name="CyanogenMod/android_external_bash" remote="github" revision="bash-4.1-froyo"/>
+  <project path="external/bash" name="liudidi/android_external_bash" remote="github" revision="bash-4.1-froyo"/>
   <project path="external/bison" name="platform/external/bison" />
   <project path="external/blktrace" name="platform/external/blktrace" />
-  <project path="external/bluetooth/bluez" name="CyanogenMod/android_external_bluetooth_bluez" remote="github" revision="froyo-stable"/>
+  <project path="external/bluetooth/bluez" name="liudidi/android_external_bluetooth_bluez" remote="github" revision="froyo-stable"/>
   <project path="external/bluetooth/glib" name="platform/external/bluetooth/glib" />
   <project path="external/bluetooth/hcidump" name="platform/external/bluetooth/hcidump" />
   <project path="external/bsdiff" name="platform/external/bsdiff" />
-  <project path="external/busybox" name="CyanogenMod/android_external_busybox" remote="github" revision="froyo-stable"/>
+  <project path="external/busybox" name="liudidi/gaosp_external_busybox" remote="github" revision="froyo"/>
   <project path="external/bzip2" name="platform/external/bzip2" />
   <project path="external/clearsilver" name="platform/external/clearsilver" />
-  <project path="external/compcache" name="CyanogenMod/android_external_compcache" revision="master" remote="github"/>
+  <project path="external/compcache" name="liudidi/android_external_compcache" revision="master" remote="github"/>
   <project path="external/dbus" name="platform/external/dbus" />
   <project path="external/dhcpcd" name="platform/external/dhcpcd" />
   <project path="external/dnsmasq" name="platform/external/dnsmasq" />
-  <project path="external/dropbear" name="CyanogenMod/android_external_dropbear" revision="master" remote="github"/>
-  <project path="external/e2fsprogs" name="CyanogenMod/android_external_e2fsprogs" revision="master" remote="github"/>
+  <project path="external/dropbear" name="liudidi/android_external_dropbear" revision="master" remote="github"/>
+  <project path="external/e2fsprogs" name="liudidi/android_external_e2fsprogs" revision="master" remote="github"/>
   <project path="external/easymock" name="platform/external/easymock" />
   <project path="external/elfcopy" name="platform/external/elfcopy" />
   <project path="external/elfutils" name="platform/external/elfutils" />
@@ -64,144 +64,144 @@
   <project path="external/icu4c" name="platform/external/icu4c" />
   <project path="external/iproute2" name="platform/external/iproute2" />
   <project path="external/ipsec-tools" name="platform/external/ipsec-tools" />
-  <project path="external/iptables" name="CyanogenMod/android_external_iptables" revision="master" remote="github"/>
+  <project path="external/iptables" name="liudidi/android_external_iptables" revision="master" remote="github"/>
   <project path="external/jdiff" name="platform/external/jdiff" />
   <project path="external/jhead" name="platform/external/jhead" />
-  <project path="external/jpeg" name="CyanogenMod/android_external_jpeg" remote="github" revision="froyo-stable"/>
+  <project path="external/jpeg" name="liudidi/android_external_jpeg" remote="github" revision="froyo-stable"/>
   <project path="external/jsr305" name="platform/external/jsr305" />
   <project path="external/junit" name="platform/external/junit" />
   <project path="external/kernel-headers" name="platform/external/kernel-headers" />
   <project path="external/libffi" name="platform/external/libffi" />
-  <project path="external/libncurses" name="CyanogenMod/android_external_libncurses" remote="github" revision="libncurses-5.7-froyo"/>
+  <project path="external/libncurses" name="liudidi/android_external_libncurses" remote="github" revision="libncurses-5.7-froyo"/>
   <project path="external/libpcap" name="platform/external/libpcap" />
-  <project path="external/libpng" name="CyanogenMod/android_external_libpng" remote="github" revision="froyo-stable"/>
+  <project path="external/libpng" name="liudidi/android_external_libpng" remote="github" revision="froyo-stable"/>
   <project path="external/libxml2" name="platform/external/libxml2" />
-  <project path="external/lzo" name="fries/android-external-liblzo" revision="master" remote="github"/>
-  <project path="external/mtpd" name="CyanogenMod/android_external_mtpd" remote="github" revision="froyo-stable"/>
-  <project path="external/nano" name="CyanogenMod/android_external_nano" remote="github" revision="nano-2.2.4-froyo"/>
+  <project path="external/lzo" name="liudidi/android-external-liblzo" revision="master" remote="github"/>
+  <project path="external/mtpd" name="liudidi/android_external_mtpd" remote="github" revision="froyo-stable"/>
+  <project path="external/nano" name="liudidi/android_external_nano" remote="github" revision="nano-2.2.4-froyo"/>
   <project path="external/netcat" name="platform/external/netcat" />
   <project path="external/netperf" name="platform/external/netperf" />
   <project path="external/neven" name="platform/external/neven" />
-  <project path="external/opencore" name="CyanogenMod/android_external_opencore" remote="github" revision="froyo-stable"/>
-  <project path="external/openssl" name="CyanogenMod/android_external_openssl" remote="github" revision="froyo-stable"/>
-  <project path="external/openvpn" name="CyanogenMod/android_external_openvpn" remote="github" revision="master"/>
+  <project path="external/opencore" name="liudidi/android_external_opencore" remote="github" revision="froyo-stable"/>
+  <project path="external/openssl" name="liudidi/android_external_openssl" remote="github" revision="froyo-stable"/>
+  <project path="external/openvpn" name="liudidi/android_external_openvpn" remote="github" revision="master"/>
   <project path="external/oprofile" name="platform/external/oprofile" />
   <project path="external/ping" name="platform/external/ping" />
   <project path="external/ppp" name="platform/external/ppp" />
   <project path="external/proguard" name="platform/external/proguard" />
-  <project path="external/qemu" name="platform/external/qemu"  revision="tools_r6"/>
+  <project path="external/qemu" name="platform/external/qemu"  revision="froyo"/>
   <project path="external/quake" name="platform/external/quake" />
-  <project path="external/rsync" name="dylex/android_external_rsync" remote="github" revision="master" />
+  <project path="external/rsync" name="liudidi/android_external_rsync" remote="github" revision="master" />
   <project path="external/safe-iop" name="platform/external/safe-iop" />
-  <project path="external/skia" name="CyanogenMod/android_external_skia" remote="github" revision="froyo-stable"/>
+  <project path="external/skia" name="liudidi/android_external_skia" remote="github" revision="froyo-stable"/>
   <project path="external/sonivox" name="platform/external/sonivox" />
   <project path="external/speex" name="platform/external/speex" />
   <project path="external/sqlite" name="platform/external/sqlite" />
   <project path="external/srec" name="platform/external/srec" />
-  <project path="external/stlport" name="platform/external/stlport" revision="master" />
+  <project path="external/stlport" name="platform/external/stlport" revision="froyo" />
   <project path="external/strace" name="platform/external/strace" />
   <project path="external/svox" name="platform/external/svox" />
   <project path="external/tagsoup" name="platform/external/tagsoup" />
   <project path="external/tcpdump" name="platform/external/tcpdump" />
   <project path="external/tinyxml" name="platform/external/tinyxml" />
-  <project path="external/tslib" name="CyanogenMod/android_external_tslib" remote="github" revision="froyo-stable"/>
+  <project path="external/tslib" name="liudidi/android_external_tslib" remote="github" revision="froyo-stable"/>
   <project path="external/tremolo" name="platform/external/tremolo" />
-  <project path="external/v8" name="CyanogenMod/android_external_v8" remote="github" revision="froyo-stable"/>
-  <project path="external/webkit" name="CyanogenMod/android_external_webkit" remote="github" revision="froyo-stable"/>
-  <project path="external/wireless-tools" name="CyanogenMod/android_external_wireless-tools" remote="github" revision="master"/>
-  <project path="external/wpa_supplicant" name="CyanogenMod/android_external_wpa_supplicant" remote="github" revision="froyo-stable"/>
-  <project path="external/wpa_supplicant_6" name="CyanogenMod/android_external_wpa_supplicant_6" remote="github" revision="froyo-stable"/>
+  <project path="external/v8" name="liudidi/android_external_v8" remote="github" revision="froyo-stable"/>
+  <project path="external/webkit" name="liudidi/android_external_webkit" remote="github" revision="froyo-stable"/>
+  <project path="external/wireless-tools" name="liudidi/android_external_wireless-tools" remote="github" revision="master"/>
+  <project path="external/wpa_supplicant" name="liudidi/android_external_wpa_supplicant" remote="github" revision="froyo-stable"/>
+  <project path="external/wpa_supplicant_6" name="liudidi/android_external_wpa_supplicant_6" remote="github" revision="froyo-stable"/>
   <project path="external/xmlwriter" name="platform/external/xmlwriter" />
-  <project path="external/yaffs2" name="CyanogenMod/android_external_yaffs2" remote="github" revision="froyo-stable"/>
+  <project path="external/yaffs2" name="liudidi/android_external_yaffs2" remote="github" revision="froyo-stable"/>
   <project path="external/zlib" name="platform/external/zlib" />
-  <project path="external/klogtail" name="nopy/android_external_klogtail" remote="github" revision="master" />
+  <project path="external/klogtail" name="liudidi/android_external_klogtail" remote="github" revision="master" />
 
-  <project path="frameworks/base" name="drakaz/gaosp_frameworks_base" remote="github" revision="gaosp-froyo" />
+  <project path="frameworks/base" name="liudidi/gaosp_frameworks_base" remote="github" revision="gaosp-froyo" />
   <project path="frameworks/ex" name="platform/frameworks/ex" />
   <project path="frameworks/opt/emoji" name="platform/frameworks/opt/emoji" />
-  <project path="frameworks/policies/base" name="drakaz/gaosp_frameworks_policies_base" remote="github" revision="gaosp-froyo" />
+  <project path="frameworks/policies/base" name="liudidi/deprecated_gaosp_frameworks_policies_base" remote="github" revision="gaosp-froyo" />
 
-  <project path="hardware/alsa_sound" name="platform/hardware/alsa_sound" revision="master" />
+  <project path="hardware/alsa_sound" name="platform/hardware/alsa_sound" revision="aosp/froyo" />
   <project path="hardware/broadcom/wlan" name="platform/hardware/broadcom/wlan" />
-  <project path="hardware/libhardware" name="CyanogenMod/android_hardware_libhardware" remote="github" revision="froyo-stable"/>
-  <project path="hardware/libhardware_legacy" name="drakaz/gaosp_hardware_libhardware_legacy" remote="github" revision="gaosp-froyo" />
-  <project path="hardware/msm7k" name="drakaz/gaosp_hardware_msm7k" remote="github" revision="gaosp-froyo"/>
-  <project path="hardware/qcom/gps" name="drakaz/gaosp_hardware_qcom_gps" remote="github" revision="gaosp-froyo" />
-  <project path="hardware/qcom/mm-core" name="CyanogenMod/android_hardware_qcom_mm-core" remote="github" revision="froyo-stable"/>
-  <project path="hardware/qcom/mm-video" name="CyanogenMod/android_hardware_qcom_mm-video" remote="github" revision="froyo-stable"/>
-  <project path="hardware/ril" name="drakaz/gaosp_hardware_ril" remote="github" revision="gaosp-froyo" />
+  <project path="hardware/libhardware" name="liudidi/android_hardware_libhardware" remote="github" revision="froyo-stable"/>
+  <project path="hardware/libhardware_legacy" name="liudidi/deprecated_gaosp_hardware_libhardware_legacy" remote="github" revision="gaosp-froyo" />
+  <project path="hardware/msm7k" name="liudidi/deprecated_gaosp_hardware_msm7k" remote="github" revision="gaosp-froyo"/>
+  <project path="hardware/qcom/gps" name="liudidi/gaosp_hardware_qcom_gps" remote="github" revision="gaosp-froyo" />
+  <project path="hardware/qcom/mm-core" name="liudidi/android_hardware_qcom_mm-core" remote="github" revision="froyo-stable"/>
+  <project path="hardware/qcom/mm-video" name="liudidi/android_hardware_qcom_mm-video" remote="github" revision="froyo-stable"/>
+  <project path="hardware/ril" name="liudidi/gaosp_hardware_ril" remote="github" revision="gaosp-froyo" />
   <project path="hardware/ti/omap3" name="platform/hardware/ti/omap3" />
   <project path="hardware/ti/wlan" name="platform/hardware/ti/wlan" />
 
-  <project path="gaosp-kernel" name="drakaz/gaosp_kernel" remote="github" revision="gaosp-2.6.29"/>
+  <project path="gaosp-kernel" name="liudidi/gaosp_kernel" remote="github" revision="gaosp-2.6.29"/>
 
-  <project path="ndk" name="platform/ndk" revision="master" />
+  <project path="ndk" name="platform/ndk" revision="froyo" />
 
   <project path="packages/apps/AccountsAndSyncSettings" name="platform/packages/apps/AccountsAndSyncSettings" />
   <project path="packages/apps/AlarmClock" name="platform/packages/apps/AlarmClock" />
-  <project path="packages/apps/Bluetooth" name="CyanogenMod/android_packages_apps_Bluetooth" remote="github" revision="froyo-stable"/>
-  <project path="packages/apps/Browser" name="CyanogenMod/android_packages_apps_Browser" remote="github" revision="froyo-stable"/>
+  <project path="packages/apps/Bluetooth" name="liudidi/android_packages_apps_Bluetooth" remote="github" revision="froyo-stable"/>
+  <project path="packages/apps/Browser" name="liudidi/android_packages_apps_Browser" remote="github" revision="froyo-stable"/>
   <project path="packages/apps/Calculator" name="platform/packages/apps/Calculator" />
   <project path="packages/apps/Calendar" name="platform/packages/apps/Calendar" />
-  <project path="packages/apps/Camera" name="nopy/gaosp_packages_apps_Camera" remote="github" revision="gaosp-froyo" />
+  <project path="packages/apps/Camera" name="liudidi/gaosp_packages_apps_Camera" remote="github" revision="gaosp-froyo" />
   <project path="packages/apps/CertInstaller" name="platform/packages/apps/CertInstaller" />
-  <project path="packages/apps/CMParts" name="CyanogenMod/android_packages_apps_CMParts" remote="github" revision="master"/>
-  <project path="packages/apps/CMPartsHelper" name="CyanogenMod/android_packages_apps_CMPartsHelper" remote="github" revision="froyo-stable"/>
-  <project path="packages/apps/CMWallpapers" name="CyanogenMod/android_packages_apps_CMWallpapers" remote="github" revision="froyo-stable"/>
-  <project path="packages/apps/Contacts" name="CyanogenMod/android_packages_apps_Contacts" remote="github" revision="froyo-stable"/>
-  <project path="packages/apps/DeskClock" name="CyanogenMod/android_packages_apps_DeskClock" remote="github" revision="froyo-stable"/>
-  <project path="packages/apps/DSPManager" name="CyanogenMod/android_packages_apps_DSPManager" remote="github" revision="froyo-stable"/>
-  <project path="packages/apps/Email" name="CyanogenMod/android_packages_apps_Email" remote="github" revision="froyo-stable"/>
-  <project path="packages/apps/FileManager" name="CyanogenMod/android_packages_apps_FileManager" remote="github" revision="master"/>
-  <project path="packages/apps/Gallery" name="Obihoernchen/android_packages_apps_Gallery" remote="github" />
+  <project path="packages/apps/CMParts" name="liudidi/android_packages_apps_CMParts" remote="github" revision="froyo"/>
+  <project path="packages/apps/CMPartsHelper" name="liudidi/android_packages_apps_CMPartsHelper" remote="github" revision="froyo-stable"/>
+  <project path="packages/apps/CMWallpapers" name="liudidi/android_packages_apps_CMWallpapers" remote="github" revision="froyo-stable"/>
+  <project path="packages/apps/Contacts" name="liudidi/android_packages_apps_Contacts" remote="github" revision="froyo-stable"/>
+  <project path="packages/apps/DeskClock" name="liudidi/android_packages_apps_DeskClock" remote="github" revision="froyo-stable"/>
+  <project path="packages/apps/DSPManager" name="liudidi/android_packages_apps_DSPManager" remote="github" revision="froyo-stable"/>
+  <project path="packages/apps/Email" name="liudidi/android_packages_apps_Email" remote="github" revision="froyo-stable"/>
+  <project path="packages/apps/FileManager" name="liudidi/android_packages_apps_FileManager" remote="github" revision="master"/>
+  <project path="packages/apps/Gallery" name="liudidi/android_packages_apps_Gallery" remote="github" />
   <project path="packages/apps/Gallery3D" name="Androbot/android_packages_apps_Gallery3D" remote="github" />
-  <project path="packages/apps/GaospConf" name="Obihoernchen/gaosp_packages_apps_GaospConf" remote="github" revision="release" />
+  <project path="packages/apps/GaospConf" name="liudidi/drakaz_gaosp_packages_apps_GaospConf" remote="github" revision="release" />
   <project path="packages/apps/HTMLViewer" name="platform/packages/apps/HTMLViewer" />
   <project path="packages/apps/IM" name="platform/packages/apps/IM" />
   <project path="packages/apps/Launcher2" name="platform/packages/apps/Launcher2" />
-  <project path="packages/apps/ADWLauncher" name="CyanogenMod/android_packages_apps_ADWLauncher" remote="github" revision="froyo-stable"/>
-  <project path="packages/apps/Mms" name="CyanogenMod/android_packages_apps_Mms" remote="github" revision="froyo-stable"/>
-  <project path="packages/apps/Music" name="CyanogenMod/android_packages_apps_Music" remote="github" revision="froyo-stable"/>
+  <project path="packages/apps/ADWLauncher" name="liudidi/android_packages_apps_ADWLauncher" remote="github" revision="froyo-stable"/>
+  <project path="packages/apps/Mms" name="liudidi/android_packages_apps_Mms" remote="github" revision="froyo-stable"/>
+  <project path="packages/apps/Music" name="liudidi/android_packages_apps_Music" remote="github" revision="froyo-stable"/>
   <project path="packages/apps/PackageInstaller" name="platform/packages/apps/PackageInstaller" />
-  <project path="packages/apps/Phone" name="drakaz/gaosp_packages_apps_Phone" remote="github" revision="gaosp-froyo" />
-  <project path="packages/apps/Protips" name="CyanogenMod/android_packages_apps_Protips" remote="github" revision="froyo-stable"/>
+  <project path="packages/apps/Phone" name="liudidi/gaosp_packages_apps_Phone" remote="github" revision="gaosp-froyo" />
+  <project path="packages/apps/Protips" name="liudidi/android_packages_apps_Protips" remote="github" revision="froyo-stable"/>
   <project path="packages/apps/Provision" name="platform/packages/apps/Provision"/>
   <project path="packages/apps/QuickSearchBox" name="platform/packages/apps/QuickSearchBox" />
-  <project path="packages/apps/Settings" name="drakaz/gaosp_android_packages_apps_Settings" remote="github" revision="gaosp-froyo" />
-  <project path="packages/apps/SoundRecorder" name="CyanogenMod/android_packages_apps_SoundRecorder" remote="github" revision="froyo-stable"/>
+  <project path="packages/apps/Settings" name="liudidi/gaosp_android_packages_apps_Settings" remote="github" revision="gaosp-froyo" />
+  <project path="packages/apps/SoundRecorder" name="liudidi/android_packages_apps_SoundRecorder" remote="github" revision="froyo-stable"/>
   <project path="packages/apps/SpeechRecorder" name="platform/packages/apps/SpeechRecorder" />
   <project path="packages/apps/Stk" name="platform/packages/apps/Stk" />
-  <project path="packages/apps/Superuser" name="CyanogenMod/android_packages_apps_Superuser" remote="github" revision="master"/>
-  <project path="packages/apps/Torch" name="nopy/android_packages_apps_Torch" remote="github" revision="master" />
-  <project path="packages/apps/TSCalibration" name="CyanogenMod/android_packages_apps_TSCalibration" remote="github" revision="froyo-stable"/>
-  <project path="packages/apps/VoiceDialer" name="CyanogenMod/android_packages_apps_VoiceDialer" remote="github" revision="froyo-stable"/>
+  <project path="packages/apps/Superuser" name="liudidi/android_packages_apps_Superuser" remote="github" revision="master"/>
+  <project path="packages/apps/Torch" name="liudidi/android_packages_apps_Torch" remote="github" revision="master" />
+  <project path="packages/apps/TSCalibration" name="liudidi/android_packages_apps_TSCalibration" remote="github" revision="froyo-stable"/>
+  <project path="packages/apps/VoiceDialer" name="liudidi/android_packages_apps_VoiceDialer" remote="github" revision="froyo-stable"/>
   <project path="packages/experimental" name="platform/packages/experimental" />
-  <project path="packages/inputmethods/LatinIME" name="drakaz/gaosp_packages_inputmethods_LatinIME" remote="github" revision="gaosp-froyo" />
+  <project path="packages/inputmethods/LatinIME" name="liudidi/android_packages_inputmethods_LatinIME" remote="github" revision="froyo-stable" />
   <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" />
   <project path="packages/inputmethods/PinyinIME" name="platform/packages/inputmethods/PinyinIME" />
   <project path="packages/providers/ApplicationsProvider" name="platform/packages/providers/ApplicationsProvider" />
   <project path="packages/providers/CalendarProvider" name="platform/packages/providers/CalendarProvider" />
   <project path="packages/providers/ContactsProvider" name="platform/packages/providers/ContactsProvider" />
-  <project path="packages/providers/DownloadProvider" name="CyanogenMod/android_packages_providers_DownloadProvider" remote="github" revision="froyo-stable"/>
+  <project path="packages/providers/DownloadProvider" name="liudidi/android_packages_providers_DownloadProvider" remote="github" revision="froyo-stable"/>
   <project path="packages/providers/DrmProvider" name="platform/packages/providers/DrmProvider" />
   <project path="packages/providers/GoogleContactsProvider" name="platform/packages/providers/GoogleContactsProvider" />
-  <project path="packages/providers/MediaProvider" name="drakaz/gaosp_packages_providers_MediaProvider" remote="github" revision="gaosp-froyo" />
+  <project path="packages/providers/MediaProvider" name="liudidi/deprecated_gaosp_packages_providers_MediaProvider" remote="github" revision="gaosp-froyo" />
   <project path="packages/providers/TelephonyProvider" name="platform/packages/providers/TelephonyProvider" />
   <project path="packages/providers/UserDictionaryProvider" name="platform/packages/providers/UserDictionaryProvider" />
-  <project path="packages/wallpapers/Basic" name="CyanogenMod/android_packages_wallpapers_Basic" remote="github" revision="froyo-stable"/>
+  <project path="packages/wallpapers/Basic" name="liudidi/android_packages_wallpapers_Basic" remote="github" revision="froyo-stable"/>
   <project path="packages/wallpapers/LivePicker" name="platform/packages/wallpapers/LivePicker" />
-  <project path="packages/wallpapers/MagicSmoke" name="CyanogenMod/android_packages_wallpapers_MagicSmoke" remote="github" revision="froyo-stable"/>
+  <project path="packages/wallpapers/MagicSmoke" name="liudidi/android_packages_wallpapers_MagicSmoke" remote="github" revision="froyo-stable"/>
   <project path="packages/wallpapers/MusicVisualization" name="platform/packages/wallpapers/MusicVisualization" />
 
   <project path="prebuilt" name="platform/prebuilt" revision="master" />
-  <project path="sdk" name="platform/sdk"  revision="tools_r6"/>
-  <project path="system/bluetooth" name="drakaz/gaosp_system_bluetooth" remote="github" revision="gaosp-froyo" />
-  <project path="system/core" name="drakaz/gaosp_system_core" remote="github" revision="gaosp-froyo" />
-  <project path="system/extras" name="CyanogenMod/android_system_extras" remote="github" revision="froyo-stable"/>
-  <project path="system/netd" name="drakaz/gaosp_system_netd" remote="github" revision="gaosp-froyo" />
-  <project path="system/vold" name="drakaz/gaosp_system_vold" remote="github" revision="gaosp-froyo" />
+  <project path="sdk" name="platform/sdk"  revision="korg/aosp/tools_r6"/>
+  <project path="system/bluetooth" name="liudidi/gaosp_system_bluetooth" remote="github" revision="gaosp-froyo" />
+  <project path="system/core" name="liudidi/gaosp_system_core" remote="github" revision="gaosp-froyo" />
+  <project path="system/extras" name="liudidi/android_system_extras" remote="github" revision="froyo-stable"/>
+  <project path="system/netd" name="liudidi/deprecated_gaosp_system_netd" remote="github" revision="gaosp-froyo" />
+  <project path="system/vold" name="liudidi/deprecated_gaosp_system_vold" remote="github" revision="gaosp-froyo" />
   <project path="system/wlan/ti" name="platform/system/wlan/ti" />
-  <project path="PSFreedom" name="drakaz/PSFreedom_I7500" remote="github" revision="master" />
+  <project path="PSFreedom" name="liudidi/PSFreedom_I7500" remote="github" revision="master" />
   <project path="PSFreedom/pl3" name="kakaroto/PL3" remote="github" revision="master" />
 
 </manifest>