all manifests: first 11.10 release

manifests from:

https://android-build.linaro.org/builds/~linaro-android/beagle/#build=294
https://android-build.linaro.org/builds/~linaro-android/landing-snowball/#build=10
https://android-build.linaro.org/builds/~linaro-android/panda/#build=313
https://android-build.linaro.org/builds/~linaro-android/staging-imx53/#build=15
https://android-build.linaro.org/builds/~linaro-android/staging-panda/#build=15
https://android-build.linaro.org/builds/~linaro-android/staging-snowball/#build=17

changes from last 11.09 release

new landing-snowball.xml

boot/u-boot-linaro-stable

default.xml, staging-panda.xml
-  7da712c61fbdeb0fdd1b1c8c3f9005128c004378
staging-iMX53.xml
-  1b1a2bc82bf9b8bbc1eb204ffdf0e4283036c857 (rebase)
all
+  de7b464fe0a2f841db43556df422409c577830fb

de7b464 mmc: omap: config VMMC, MMC1_PBIAS
de0c3a7 mmc: omap: enable high capacity
775b2ce omap4: reduce default operating point for 4460 devices
212bd07 Revert "armv7: adapt omap3 to the new cache maintenance framework"
a2e6669 Revert "omap: enable caches at system start-up"
7454828 U-Boot/SPL: omap4: Make ddr pre-calculated timings as default.
cd8352c OMAP4: removing fdt_addr from the default env
74750f3 pxe: make the first label the implicit default
5c8c867 Allow loading of u-boot.bin for backward compatibility

device/linaro/beagleboard
defaul.xml, staging-iMX53.xml, staging-origen.xml, staging-panda.xml, staging-snowball.xml
-  9c5ab0578ff55a3da04c8128ed9eff1ba8857d3a
+  5029d2ca236dd840e9b2785ff4daeb7c9b627995

5029d2c beagleboard: Don't pass CPU specific flags to the HOST compiler
79145fa beagleboard: Add CPU specific compiler flags tuned for the target device

device/linaro/common
defaul.xml, staging-iMX53.xml, staging-origen.xml, staging-panda.xml, staging-snowball.xml
-  5e841278ca0f34e41a4206f1c0b6db93db42d2ec
+  1550de16d8bf3e80b333b73ee1dec7750fe552f8

1550de1 common: add mmtest to PRODUCT_PACKAGES

device/linaro/pandaboard
defaul.xml, staging-iMX53.xml, staging-origen.xml, staging-panda.xml, staging-snowball.xml
-  7b5f142cd486160d9a4fd883fd127e53124949e7
+  5dac14677e208091d28f540a38e98f8152e93b58

5dac146 pandaboard: Don't pass CPU optimization flags to HOST compiler
1883346 pandaboard: Add CPU specific compiler flags tuned for the target device

device/linaro/imx53
staging-iMX53.xml
- c4a98364ce02be31c2bccc19c349d0a3d9dc0dbe
+ 9050470530fae8d52e6b326bbadf3a2b86d212bb

9050470 imx53: Don't pass CPU specific flags to the HOST compiler
9f01f87 Merge "imx53: Add CPU specific compiler flags tuned for the target devic
6e6d9d7 imx53: Add CPU specific compiler flags tuned for the target device

device/linaro/origen
staging-origen.xml
- d6e057688f93fbfe43f5e5d4fcd1722b24236d
+ dc6564ef13bdee7f85def7760f9affcc9ea7c4

dc6564e Update Android board make file to add wpa configuration file.
f9cefef update init.origen.rc for origen WIFI support.
2cf8dec Add WPA supplicant configuration file for Origen WIFI support.
a56e42d origen: Don't pass CPU specific flags to the HOST compiler
1ee6c96 origen: Add CPU specific compiler flags tuned for the target device

device/linaro/snowball
staging-snowball.xml
- 12e4fc630859195caef2d6b83a18d5401ac0
+ 1110f467b89da988c49079e8ddb769f27f32

1110f46 snowball: Add SMP and CPU specific compiler flags

people/afrantzis/glmark2
default.xml, staging-iMX53.xml, staging-origen.xml
-  ec46b4e5fa05575ababa647c964a7367e5fc9cff
+  e3727c42da8cf7dd554df5d25c6ee249bad0a452

e3727c4 Android: Use a custom EGLConfigChooser that gracefully handles eglChoose

people/bernhardrosenkranzer/android-kernel-iMX53
staging-iMX53.xml
- 3d981d9418c53e3e1a079582088121c641588791
+ 5500ccef0d11c598629295769fdbe07609d82990

5500cce Add CONFIG_INPUT_UINPUT for faketsd

people/kwerner/libunwind
default.xml, staging-iMX53.xml, staging-origen.xml
+ fc05b927bc13c00d38a540f603f4fcb4f7325846

New

platform/bionic
default.xml, staging-iMX53.xml, staging-origen.xml
- e762d567b75440462b7da0b5f84a98230541d692
+ 46e1d893c41c20e3d348fb64414b8294a3eebcb2

46e1d89 linker: Add support for GNU style symbol hashes

platform/build
default.xml, staging-iMX53.xml, staging-origen.xml
- a1d2e88ca8114486ba8adb29bc7f0e810261f638
+ edec05c8c7186bea4befcf95054548db3a0143f9

edec05c Revert "Enable PRELINK" and update prelink map

platform/external/elfcopy
default.xml, staging-iMX53.xml, staging-origen.xml
- afd53a34c99d33af4f9de4595b8b537c9a02e2d3
+ 0513f4c3119ad2ca0b302eedefc58cc7f470d6de

0513f4c elfcopy: Add basic GNU-style hash support

platform/external/ffmpeg
staging-origen.xml
+ 6d020211c1fb464b956c203e6cc5a0e157d1eb13

New

platform/external/libvpx
staging-origen.xml
- 76e0247ec867fcc232fc79f21e9bf85d3c3a5a3f
+ 62644e5902d0ea9de45ed57442587020a21115e7

Many commits

platform/external/x264
staging-origen.xml
+ c8be2223e23a49c852557881d8210a70aae9cb5c

New

device/ti/proprietary-open
staging-panda.xml
- b5673fc064d28588e840f4120ff6d8acee17656e
+ 35c1da74f47c34a750ca788e0f2d7b200f37f0d7

35c1da7 BT 4460:Add firmware for WL1271L on 4460 based board

people/andygreen/repo-branch-archive
staging-panda.xml
- 7840e5d9be030f239a5b40231a22a97bebad40b6
+ 3e07d515113ba23d4ee09d7f414366e0e67fc919

Rebase tree, need a script to see diffs

device/linaro/snowball
staging-snowball.xml
- 12e4fc630859195caef2d6b83a18d5401ac042d2
+ 1110f467b89da988c49079e8ddb769f27f327f87

kernel/snowball
staging-snowball.xml
+ 7118ded1c4dbdee31da6876b1839a1b647bc41df

New, rebased tree on jstultz

Signed-off-by: Zach Pfeffer <zach.pfeffer@linaro.org>

8 files changed, 1115 insertions, 1747 deletions

diff --git a/default.xml b/default.xml
index 3999f834b..aaecc692a 100644
--- a/default.xml
+++ b/default.xml
@@ -1,217 +1,187 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
-  <remote  name="korg"
-           fetch="git://android.git.linaro.org/"
-           review="review.android.git.linaro.org" />
-  <default revision="refs/tags/android-2.3.5_r1"
-           remote="korg" />
-
-  <remote  name="linaro-android"
-           fetch="git://android.git.linaro.org/"
-           review="review.android.git.linaro.org" />
-
-  <remote  name="linaro-other"
-           fetch="git://git.linaro.org/" />
-
-  <remote  name="0xbench"
-           fetch="git://gitorious.org/0xbench/" />
-
-  <remote  name="gitorious"
-           fetch="git://gitorious.org/" />
-
-  <remote  name="omapzoom"
-           fetch="git://git.omapzoom.org/repo/" />
-
-
-  <!-- Linaro changes -->
-  <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_2.3.5" remote="linaro-android" />
-
-  <project path="device/linaro/beagleboard" name="device/linaro/beagleboard" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="device/linaro/pandaboard" name="device/linaro/pandaboard" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="device/linaro/u8500href" name="device/linaro/u8500href" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="device/linaro/common" name="device/linaro/common" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="system/vold" name="platform/system/vold" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="system/core" name="platform/system/core" revision="linaro_android_2.3.5" remote="linaro-android" />
-
-  <project path="dalvik" name="platform/dalvik" revision="linaro_android_2.3.5" remote="linaro-android"/>
-  <project path="external/elfcopy" name="platform/external/elfcopy" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/skia" name="platform/external/skia" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="frameworks/opt/emoji" name="platform/frameworks/opt/emoji" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="libcore" name="platform/libcore" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="system/media" name="platform/system/media" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/svox" name="platform/external/svox" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/busybox" name="platform/external/busybox" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_2.3.5" remote="linaro-android" />
-
-  <project path="hardware/libhardware" name="platform/hardware/libhardware" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project name="people/kwerner/libunwind" path="external/libunwind" remote="linaro-other" revision="fc05b927bc13c00d38a540f603f4fcb4f7325846" />
-
-  <!-- Power WG -->
-  <project path="external/powertop" name="platform/external/powertop"  remote="linaro-android" revision="linaro" />
-  <project path="external/ncurses" name="platform/external/ncurses"  remote="linaro-android" revision="linaro" />
-  <project path="external/libnl" name="platform/external/libnl"  remote="linaro-android" revision="linaro" />
-
-  <project path="build" name="platform/build" revision="linaro_android_2.3.5" remote="linaro-android" >
-    <copyfile src="core/root.mk" dest="Makefile" />
+  <remote fetch="git://gitorious.org/0xbench/" name="0xbench"/>
+  <remote fetch="git://gitorious.org/" name="gitorious"/>
+  <remote fetch="git://android.git.linaro.org/" name="korg" review="review.android.git.linaro.org"/>
+  <remote fetch="git://android.git.linaro.org/" name="linaro-android" review="review.android.git.linaro.org"/>
+  <remote fetch="git://git.linaro.org/" name="linaro-other"/>
+  <remote fetch="git://git.omapzoom.org/repo/" name="omapzoom"/>
+
+  <default remote="korg" revision="refs/tags/android-2.3.5_r1"/>
+
+  <project name="0xbench" path="packages/apps/0xbench" remote="0xbench" revision="1772a907e73e188317c60d5d9561551e5d9b6c5f"/>
+  <project name="boot/u-boot-linaro-stable" path="u-boot" remote="linaro-other" revision="de7b464fe0a2f841db43556df422409c577830fb"/>
+  <project name="device/common" revision="3b932551eb896cd1880e65b156059a5f34d2f655"/>
+  <project name="device/google/accessory/arduino" revision="ee3bb7c351e732e8f518cde0238bf9b3d810d80a"/>
+  <project name="device/google/accessory/demokit" revision="37921cd911a238cee5d79c6f63f84304c1ca36e0"/>
+  <project name="device/linaro/beagleboard" remote="linaro-android" revision="5029d2ca236dd840e9b2785ff4daeb7c9b627995"/>
+  <project name="device/linaro/common" remote="linaro-android" revision="1550de16d8bf3e80b333b73ee1dec7750fe552f8"/>
+  <project name="device/linaro/pandaboard" remote="linaro-android" revision="5dac14677e208091d28f540a38e98f8152e93b58"/>
+  <project name="device/linaro/u8500href" remote="linaro-android" revision="b316efeb3147ee8e236db39192671595570b783b"/>
+  <project name="device/sample" revision="e04c7b12e187584785a038e586b8aeccc82b33d0"/>
+  <project name="device/samsung/crespo" revision="6a740e418e0a2a9beddc4f31ee6607e90d420b17"/>
+  <project name="kernel/linaro-android" path="kernel" remote="linaro-android" revision="0023ca51966eb6e302f3cb945dbff9e794be615f"/>
+  <project name="people/afrantzis/glmark2" path="packages/apps/glmark2" remote="linaro-other" revision="e3727c42da8cf7dd554df5d25c6ee249bad0a452"/>
+  <project name="people/bernhardrosenkranzer/mmtest" path="packages/apps/mmtest" remote="linaro-other" revision="7caaadf7a48c0322693f226d7a78b78f853d51c0"/>
+  <project name="people/kwerner/libunwind" path="external/libunwind" remote="linaro-other" revision="fc05b927bc13c00d38a540f603f4fcb4f7325846"/>
+  <project name="people/tomgall/libjpeg-turbo/libjpeg-turbo" path="external/jpeg" remote="linaro-other" revision="0206f26bd4229243a87b3519d251f9e4947b6b2a"/>
+  <project name="platform/bionic" path="bionic" remote="linaro-android" revision="46e1d893c41c20e3d348fb64414b8294a3eebcb2"/>
+  <project name="platform/bootable/bootloader/legacy" path="bootable/bootloader/legacy" revision="d3271024770ddcc2fb87dd22f8280764545ab05a"/>
+  <project name="platform/bootable/diskinstaller" path="bootable/diskinstaller" revision="53bd9111b5ae1fc1180ec13755d9830f7cadacf5"/>
+  <project name="platform/bootable/recovery" path="bootable/recovery" revision="7172eb7b623f4b30f5a709d639fcd3fb51cd6220"/>
+  <project name="platform/build" path="build" remote="linaro-android" revision="edec05c8c7186bea4befcf95054548db3a0143f9">
+    <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-
-  <project path="kernel" name="kernel/linaro-android" revision="linaro-android-3.0" remote="linaro-android" />
-  <project path="u-boot" name="boot/u-boot-linaro-stable" revision="master" remote="linaro-other" />
-
-  <project path="packages/apps/0xbench" name="0xbench" revision="master" remote="0xbench" />
-  <project path="packages/apps/mmtest" name="people/bernhardrosenkranzer/mmtest" revision="master" remote="linaro-other" />
-  <project path="packages/apps/glmark2" name="people/afrantzis/glmark2" revision="master" remote="linaro-other" />
-  
-  <project path="external/jpeg" name="people/tomgall/libjpeg-turbo/libjpeg-turbo" revision="1.2-beta-linaro-andoid" remote="linaro-other" />
-  <project path="external/dbus" name="platform/external/dbus" revision="linaro-master" remote="linaro-android" />
-
-  <project path="bionic" name="platform/bionic" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/fdlibm" name="platform/external/fdlibm" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/icu4c" name="platform/external/icu4c" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/iptables" name="platform/external/iptables" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_2.3.5" remote="linaro-android" />
- 
- <!-- x-loader -->
-  <project path="device/linaro/x-loader" name="x-loader/x-loader" revision="master" remote="gitorious" />
-
-  <!-- standard Andorid manifest -->
-  <project path="bootable/bootloader/legacy" name="platform/bootable/bootloader/legacy" />
-  <project path="bootable/diskinstaller" name="platform/bootable/diskinstaller" />
-  <project path="bootable/recovery" name="platform/bootable/recovery" />
-  <project path="cts" name="platform/cts" />
-  <project path="development" name="platform/development" />
-  <project path="device/common" name="device/common" />
-  <project path="device/google/accessory/arduino" name="device/google/accessory/arduino" />
-  <project path="device/google/accessory/demokit" name="device/google/accessory/demokit" />
-  <project path="device/sample" name="device/sample" />
-  <project path="device/samsung/crespo" name="device/samsung/crespo" />
-  <project path="external/apache-http" name="platform/external/apache-http" />
-  <project path="external/astl" name="platform/external/astl" />
-  <project path="external/bison" name="platform/external/bison" />
-  <project path="external/blktrace" name="platform/external/blktrace" />
-  <project path="external/bluetooth/bluez" name="platform/external/bluetooth/bluez" />
-  <project path="external/bluetooth/glib" name="platform/external/bluetooth/glib" />
-  <project path="external/bluetooth/hcidump" name="platform/external/bluetooth/hcidump" />
-  <project path="external/bouncycastle" name="platform/external/bouncycastle" />
-  <project path="external/bsdiff" name="platform/external/bsdiff" />
-  <project path="external/bzip2" name="platform/external/bzip2" />
-  <project path="external/chromium" name="platform/external/chromium" />
-  <project path="external/clearsilver" name="platform/external/clearsilver" />
-  <project path="external/dhcpcd" name="platform/external/dhcpcd" />
-  <project path="external/dropbear" name="platform/external/dropbear" />
-  <project path="external/e2fsprogs" name="platform/external/e2fsprogs" />
-  <project path="external/easymock" name="platform/external/easymock" />
-  <project path="external/elfutils" name="platform/external/elfutils" />
-  <project path="external/embunit" name="platform/external/embunit" />
-  <project path="external/emma" name="platform/external/emma" />
-  <project path="external/esd" name="platform/external/esd" />
-  <project path="external/expat" name="platform/external/expat" />
-  <project path="external/freetype" name="platform/external/freetype" />
-  <project path="external/fsck_msdos" name="platform/external/fsck_msdos" />
-  <project path="external/genext2fs" name="platform/external/genext2fs" />
-  <project path="external/giflib" name="platform/external/giflib" />
-  <project path="external/grub" name="platform/external/grub" />
-  <project path="external/gtest" name="platform/external/gtest" />
-  <project path="external/guava" name="platform/external/guava" />
-  <project path="external/iproute2" name="platform/external/iproute2" />
-  <project path="external/ipsec-tools" name="platform/external/ipsec-tools" />
-  <project path="external/jdiff" name="platform/external/jdiff" />
-  <project path="external/jhead" name="platform/external/jhead" />
-  <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/libgsm" name="platform/external/libgsm" />
-  <project path="external/libnfc-nxp" name="platform/external/libnfc-nxp" />
-  <project path="external/libpcap" name="platform/external/libpcap" />
-  <project path="external/libpng" name="platform/external/libpng" />
-  <project path="external/libvpx" name="platform/external/libvpx" />
-  <project path="external/libxml2" name="platform/external/libxml2" />
-  <project path="external/mtpd" name="platform/external/mtpd" />
-  <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/nist-sip" name="platform/external/nist-sip" />
-  <project path="external/oauth" name="platform/external/oauth" />
-  <project path="external/openssl" name="platform/external/openssl" />
-  <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/protobuf" name="platform/external/protobuf" />
-  <project path="external/qemu" name="platform/external/qemu" />
-  <project path="external/quake" name="platform/external/quake" />
-  <project path="external/safe-iop" name="platform/external/safe-iop" />
-  <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/strace" name="platform/external/strace" />
-  <project path="external/tagsoup" name="platform/external/tagsoup" />
-  <project path="external/tinyxml" name="platform/external/tinyxml" />
-  <project path="external/tremolo" name="platform/external/tremolo" />
-  <project path="external/v8" name="platform/external/v8" />
-  <project path="external/wpa_supplicant" name="platform/external/wpa_supplicant" />
-  <project path="external/wpa_supplicant_6" name="platform/external/wpa_supplicant_6" />
-  <project path="external/xmlwriter" name="platform/external/xmlwriter" />
-  <project path="external/yaffs2" name="platform/external/yaffs2" />
-  <project path="external/zlib" name="platform/external/zlib" />
-  <project path="frameworks/ex" name="platform/frameworks/ex" />
-  <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" />
-  <project path="hardware/ril" name="platform/hardware/ril" />
-  <project path="ndk" name="platform/ndk" />
-  <project path="packages/apps/AccountsAndSyncSettings" name="platform/packages/apps/AccountsAndSyncSettings" />
-  <project path="packages/apps/Bluetooth" name="platform/packages/apps/Bluetooth" />
-  <project path="packages/apps/Browser" name="platform/packages/apps/Browser" />
-  <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="platform/packages/apps/Camera" />
-  <project path="packages/apps/CellBroadcastReceiver" name="platform/packages/apps/CellBroadcastReceiver" />
-  <project path="packages/apps/CertInstaller" name="platform/packages/apps/CertInstaller" />
-  <project path="packages/apps/Contacts" name="platform/packages/apps/Contacts" />
-  <project path="packages/apps/DeskClock" name="platform/packages/apps/DeskClock" />
-  <project path="packages/apps/Email" name="platform/packages/apps/Email" />
-  <project path="packages/apps/Gallery" name="platform/packages/apps/Gallery" />
-  <project path="packages/apps/Gallery3D" name="platform/packages/apps/Gallery3D" />
-  <project path="packages/apps/HTMLViewer" name="platform/packages/apps/HTMLViewer" />
-  <project path="packages/apps/Launcher2" name="platform/packages/apps/Launcher2" />
-  <project path="packages/apps/Mms" name="platform/packages/apps/Mms" />
-  <project path="packages/apps/Music" name="platform/packages/apps/Music" />
-  <project path="packages/apps/Nfc" name="platform/packages/apps/Nfc" />
-  <project path="packages/apps/PackageInstaller" name="platform/packages/apps/PackageInstaller" />
-  <project path="packages/apps/Phone" name="platform/packages/apps/Phone" />
-  <project path="packages/apps/Protips" name="platform/packages/apps/Protips" />
-  <project path="packages/apps/QuickSearchBox" name="platform/packages/apps/QuickSearchBox" />
-  <project path="packages/apps/SmartCardService" name="platform/packages/apps/SmartCardService" />
-  <project path="packages/apps/SoundRecorder" name="platform/packages/apps/SoundRecorder" />
-  <project path="packages/apps/SpeechRecorder" name="platform/packages/apps/SpeechRecorder" />
-  <project path="packages/apps/Stk" name="platform/packages/apps/Stk" />
-  <project path="packages/apps/Tag" name="platform/packages/apps/Tag" />
-  <project path="packages/apps/VoiceDialer" name="platform/packages/apps/VoiceDialer" />
-  <project path="packages/experimental" name="platform/packages/experimental" />
-  <project path="packages/inputmethods/LatinIME" name="platform/packages/inputmethods/LatinIME" />
-  <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="platform/packages/providers/DownloadProvider" />
-  <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="platform/packages/providers/MediaProvider" />
-  <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="platform/packages/wallpapers/Basic" />
-  <project path="packages/wallpapers/LivePicker" name="platform/packages/wallpapers/LivePicker" />
-  <project path="packages/wallpapers/MagicSmoke" name="platform/packages/wallpapers/MagicSmoke" />
-  <project path="packages/wallpapers/MusicVisualization" name="platform/packages/wallpapers/MusicVisualization" />
-  <project path="prebuilt" name="platform/prebuilt" />
-  <project path="sdk" name="platform/sdk" />
-  <project path="system/bluetooth" name="platform/system/bluetooth" />
-  <project path="system/extras" name="platform/system/extras" />
-  <project path="system/netd" name="platform/system/netd" />
-
+  <project name="platform/cts" path="cts" revision="6b4d831147bd65bc5a3d3e23c05626c831151615"/>
+  <project name="platform/dalvik" path="dalvik" remote="linaro-android" revision="87dc8dd69f81bb07007969dee9e71bce7fa82807"/>
+  <project name="platform/development" path="development" revision="f60f95391262f2295b9173e23a9344c8322d604a"/>
+  <project name="platform/external/apache-http" path="external/apache-http" revision="b91c5e936342afbdd58c88ac604d5dd505d0fe0c"/>
+  <project name="platform/external/astl" path="external/astl" revision="c3c760978c34d5eeea1205c0bf7f27444e192a98"/>
+  <project name="platform/external/bison" path="external/bison" revision="889df9c1efa7ca5de113407ab7793b57a6db677d"/>
+  <project name="platform/external/blktrace" path="external/blktrace" revision="ac4461c3b3e7bcbafe5336b9478657d0fa3e08aa"/>
+  <project name="platform/external/bluetooth/bluez" path="external/bluetooth/bluez" revision="02e98694ef87ea8ecb47789abf89c3f945ee0e20"/>
+  <project name="platform/external/bluetooth/glib" path="external/bluetooth/glib" revision="0c01eb3a7313a580fe34044bcdc3337d067c8a15"/>
+  <project name="platform/external/bluetooth/hcidump" path="external/bluetooth/hcidump" revision="ce36a6c7c5f8043c038415d8e270d55d9834008d"/>
+  <project name="platform/external/bouncycastle" path="external/bouncycastle" revision="3ab12958718f17e48e2816a84d403f6305cc2800"/>
+  <project name="platform/external/bsdiff" path="external/bsdiff" revision="df980d633fd0bdc0b89af26630f543d91bb87e68"/>
+  <project name="platform/external/busybox" path="external/busybox" remote="linaro-android" revision="496c5fca645e6b724b162e66931e446a85fc49d3"/>
+  <project name="platform/external/bzip2" path="external/bzip2" revision="879585bbef51b4cabaac6340a95d807dca379cdc"/>
+  <project name="platform/external/chromium" path="external/chromium" revision="5e43ad9465e402d595a3c960784b1effe2e9bd88"/>
+  <project name="platform/external/clearsilver" path="external/clearsilver" revision="3e15867df7fb41770c090ee40411a6c376574ae3"/>
+  <project name="platform/external/dbus" path="external/dbus" remote="linaro-android" revision="97b3dae199a09f003fd60fe63f1b17ec0fa5fb76"/>
+  <project name="platform/external/dhcpcd" path="external/dhcpcd" revision="17fdc0dee1db0246a59cd3b28278389043fe5134"/>
+  <project name="platform/external/dnsmasq" path="external/dnsmasq" remote="linaro-android" revision="ebf5da42ba598621e9dbb878196254e83c91d8fc"/>
+  <project name="platform/external/dropbear" path="external/dropbear" revision="d3a3a803df8f32e9ba26758b3a9d7fbd27a3dc9c"/>
+  <project name="platform/external/e2fsprogs" path="external/e2fsprogs" revision="6641b4da8001b46fd17e723a572459db0325e023"/>
+  <project name="platform/external/easymock" path="external/easymock" revision="17d5eb4006c438775d8eaa7600e947e4ac090a18"/>
+  <project name="platform/external/elfcopy" path="external/elfcopy" remote="linaro-android" revision="0513f4c3119ad2ca0b302eedefc58cc7f470d6de"/>
+  <project name="platform/external/elfutils" path="external/elfutils" revision="84cf4183ba6f577ee01abe7f1f5a6d4b23df35a8"/>
+  <project name="platform/external/embunit" path="external/embunit" revision="f5eb8b0c9abf1e9911b5c84a555bc495651595e5"/>
+  <project name="platform/external/emma" path="external/emma" revision="4d37e21b7c2fa378dbf7cfe2ea57d7f5991fe6cd"/>
+  <project name="platform/external/esd" path="external/esd" revision="224a67f2683a7ee997179fc5dd16115e39987b0f"/>
+  <project name="platform/external/expat" path="external/expat" revision="204e2ef0e1a2c2da0087cccb0c9b618d52f1d584"/>
+  <project name="platform/external/fdlibm" path="external/fdlibm" remote="linaro-android" revision="a74d3139b5e2046e52a94f6b1510d5e3d15c2bc1"/>
+  <project name="platform/external/freetype" path="external/freetype" revision="aacb8e1368a883fcbc9fe64fd0e460cef9c9b20c"/>
+  <project name="platform/external/fsck_msdos" path="external/fsck_msdos" revision="b6ee08aadb580341a4d80943741b80de16a88b5d"/>
+  <project name="platform/external/genext2fs" path="external/genext2fs" revision="28f10892a39db10b1c65125723d9737de865ef56"/>
+  <project name="platform/external/giflib" path="external/giflib" revision="b2597268aef084202a8c349d1cc072c03c6e22eb"/>
+  <project name="platform/external/grub" path="external/grub" revision="a0be411871f2e71834a2cd75dea882d732557530"/>
+  <project name="platform/external/gtest" path="external/gtest" revision="75f109c3120bf78ee89124f1f21b50ea24225236"/>
+  <project name="platform/external/guava" path="external/guava" revision="5fa17bce47c47d5538beaaef0e38f0576446709c"/>
+  <project name="platform/external/icu4c" path="external/icu4c" remote="linaro-android" revision="0fd910cf8e8f3681d7a727f09273ce76dbfe4ec9"/>
+  <project name="platform/external/iproute2" path="external/iproute2" revision="14740a4557728ba63348e0574507a71fa40a8bd4"/>
+  <project name="platform/external/ipsec-tools" path="external/ipsec-tools" revision="f5d0d0919f6c0b82611c1f8ad0cb6023a78b6ce0"/>
+  <project name="platform/external/iptables" path="external/iptables" remote="linaro-android" revision="4ebfa4c82fc82e25e1206a9197809062d5d4f306"/>
+  <project name="platform/external/jdiff" path="external/jdiff" revision="590cef7c1b48c9c3f4556ae65fbc0065d65da54a"/>
+  <project name="platform/external/jhead" path="external/jhead" revision="fd983181d9043cdf45497ace19c60fd9e4e1799c"/>
+  <project name="platform/external/jsr305" path="external/jsr305" revision="8e937939899d5fe3a6864c7ecb9bb8632678a7c7"/>
+  <project name="platform/external/junit" path="external/junit" revision="e9b8080d6d80d17729e0b7f8b1d2b573b3456cc4"/>
+  <project name="platform/external/kernel-headers" path="external/kernel-headers" revision="8abdcd4098f266e438e7129a3dfe311005686431"/>
+  <project name="platform/external/libffi" path="external/libffi" revision="5dea54fd57265ce037ac94055b9f94a45558b39e"/>
+  <project name="platform/external/libgsm" path="external/libgsm" revision="5e4516958690b9a1b2c98f88eeecba3edd2dbda4"/>
+  <project name="platform/external/libnfc-nxp" path="external/libnfc-nxp" revision="178bcc31188d60d13e7455c14e9fd902f5505331"/>
+  <project name="platform/external/libnl" path="external/libnl" remote="linaro-android" revision="bbcb553f0f4636dd40e84d320a576b3de7b95357"/>
+  <project name="platform/external/libpcap" path="external/libpcap" revision="3a7bce5dda6a8db92c9248846d0255e68c3a5b2a"/>
+  <project name="platform/external/libpng" path="external/libpng" revision="4ce0ee15f268e0161438b4133936cb2826f7fd50"/>
+  <project name="platform/external/libvpx" path="external/libvpx" revision="76e0247ec867fcc232fc79f21e9bf85d3c3a5a3f"/>
+  <project name="platform/external/libxml2" path="external/libxml2" revision="f16b5fdc2102953f6b915472200061e17e76702b"/>
+  <project name="platform/external/mtpd" path="external/mtpd" revision="fccbc17685cd8bd43cf1c1e533c4d02f6f79d667"/>
+  <project name="platform/external/ncurses" path="external/ncurses" remote="linaro-android" revision="5fc466743430377a29b0dc6a38b0d1de843581e7"/>
+  <project name="platform/external/netcat" path="external/netcat" revision="fc2dc55c510657073ef4235658167a878e82cefa"/>
+  <project name="platform/external/netperf" path="external/netperf" revision="58ecd3b7c76263900e38921360e334a416aec362"/>
+  <project name="platform/external/neven" path="external/neven" revision="7164d6ac08ab9fc1247aa29f1dafd0ef7808f0f2"/>
+  <project name="platform/external/nist-sip" path="external/nist-sip" revision="a58e4068f86c6ca3f9771d4ec8b2665d070a170e"/>
+  <project name="platform/external/oauth" path="external/oauth" revision="c76276a1d6165cfb502b06f65b1735fef0754d26"/>
+  <project name="platform/external/openssl" path="external/openssl" revision="f07bf9fa6a96c0039e832242569c8e6fc40c9a94"/>
+  <project name="platform/external/oprofile" path="external/oprofile" revision="041ee6ccda354960ebc1e1ccfff78685ec5326e1"/>
+  <project name="platform/external/ping" path="external/ping" revision="f35ea57ab6d01badde92491274ff2d74cbe3cf01"/>
+  <project name="platform/external/powertop" path="external/powertop" remote="linaro-android" revision="3d1c205aabb9a0451c6b3fe7846e8cce5521c727"/>
+  <project name="platform/external/ppp" path="external/ppp" revision="d88bff8f5384285f76576eb7707c6d9d5b98edb6"/>
+  <project name="platform/external/proguard" path="external/proguard" revision="6660cb6cb4231a03a3c02127fa5c4e7828422caa"/>
+  <project name="platform/external/protobuf" path="external/protobuf" revision="3574de1ca8301e1e13d1c89f2e2a902499d6bae9"/>
+  <project name="platform/external/qemu" path="external/qemu" revision="2fa5173bd1ce7341c50adac676a317945f0969c7"/>
+  <project name="platform/external/quake" path="external/quake" revision="9b0abf864353d47404417c1cbd8384e15be547b0"/>
+  <project name="platform/external/safe-iop" path="external/safe-iop" revision="07073634e2e3aa4f518e36ed5dec3aabc549d5fb"/>
+  <project name="platform/external/skia" path="external/skia" remote="linaro-android" revision="b17b930777b5c84e9a8048147577646a58a6a0fc"/>
+  <project name="platform/external/sonivox" path="external/sonivox" revision="d029b2378170cfd7bb34d894482065a762a54578"/>
+  <project name="platform/external/speex" path="external/speex" revision="32e4d0aa78c5879565cbcd06415fa2e344036ab5"/>
+  <project name="platform/external/sqlite" path="external/sqlite" revision="90f23688416d9f4e1e5d0128dca5f26404b6898e"/>
+  <project name="platform/external/srec" path="external/srec" revision="7390035ea61b32477243d60c452664150b61f023"/>
+  <project name="platform/external/stlport" path="external/stlport" remote="linaro-android" revision="f56d1f0242e7eb2800f552e3c3c562b02c26b2b2"/>
+  <project name="platform/external/strace" path="external/strace" revision="cfa96b379cdd6561a5cc89f2bb86ee9f4b2a3928"/>
+  <project name="platform/external/svox" path="external/svox" remote="linaro-android" revision="c54cda009637d7be08e4cd5b829ec0fc3079f60f"/>
+  <project name="platform/external/tagsoup" path="external/tagsoup" revision="68c2ec9e0acdb3214b7fb91dbab8c9fab8736817"/>
+  <project name="platform/external/tcpdump" path="external/tcpdump" remote="linaro-android" revision="616015d52648c7eb6460eb6411aa87581cbb0e13"/>
+  <project name="platform/external/tinyxml" path="external/tinyxml" revision="d589f7e4a51e75bd5c98a3defd8ee84d7059e86e"/>
+  <project name="platform/external/tremolo" path="external/tremolo" revision="9a688754461ebfc91769b5d3c8ba5aba9fe1f376"/>
+  <project name="platform/external/v8" path="external/v8" revision="6599b9dd3411791c9d89ab7efbfb4131e5664c48"/>
+  <project name="platform/external/webkit" path="external/webkit" remote="linaro-android" revision="1e02484fcaef9e1ea900b6e3323b8907c79b4bb2"/>
+  <project name="platform/external/wpa_supplicant" path="external/wpa_supplicant" revision="2b7ee495307e9fd349a0f37ec560834adbc954cc"/>
+  <project name="platform/external/wpa_supplicant_6" path="external/wpa_supplicant_6" revision="b2522a100c9c6688508261b04e83fa1d0bdc88ab"/>
+  <project name="platform/external/xmlwriter" path="external/xmlwriter" revision="e95d92246ee35273dde2bee8b00485cc14c12be5"/>
+  <project name="platform/external/yaffs2" path="external/yaffs2" revision="0fe811d9a994dd6df8aa9852c7b9241fa9aa453b"/>
+  <project name="platform/external/zlib" path="external/zlib" revision="96c70b1df1629d7f0eb8f666045bfd5eb062cebf"/>
+  <project name="platform/frameworks/base" path="frameworks/base" remote="linaro-android" revision="a08dc19c13967d6efa54443c21918288d5fb4178"/>
+  <project name="platform/frameworks/ex" path="frameworks/ex" revision="e0d5045a56146f0e7d8ea9e400f6eb209edceec5"/>
+  <project name="platform/frameworks/opt/emoji" path="frameworks/opt/emoji" remote="linaro-android" revision="941fb3d38928a8483701fe2be45ccbc6579f3633"/>
+  <project name="platform/hardware/libhardware" path="hardware/libhardware" remote="linaro-android" revision="f50b075a8b88eff482628e8ab62a04539117c7ea"/>
+  <project name="platform/hardware/libhardware_legacy" path="hardware/libhardware_legacy" revision="17f1ff8c99dada2cca93f68d434cf64a6dc692c2"/>
+  <project name="platform/hardware/ril" path="hardware/ril" revision="3b1530aef62476248825a2092c9aea800395c3b1"/>
+  <project name="platform/libcore" path="libcore" remote="linaro-android" revision="b390cef44c168f9a6cfa8b70cc7861869ab3be5d"/>
+  <project name="platform/ndk" path="ndk" revision="7a619be40e8594a961066a33b7cc9ef52f566988"/>
+  <project name="platform/packages/apps/AccountsAndSyncSettings" path="packages/apps/AccountsAndSyncSettings" revision="0179779e69d0a8ce2879cf27261af9bc2908cae0"/>
+  <project name="platform/packages/apps/Bluetooth" path="packages/apps/Bluetooth" revision="6d48feaaff63b14adc23e7b2d82854189a456f15"/>
+  <project name="platform/packages/apps/Browser" path="packages/apps/Browser" revision="7b6955578d914557eea7ff3cbcec70e953970092"/>
+  <project name="platform/packages/apps/Calculator" path="packages/apps/Calculator" revision="5c85e48a713ec70ebce65ebf1a3622035992f8c3"/>
+  <project name="platform/packages/apps/Calendar" path="packages/apps/Calendar" revision="ee794988e54a2e8172b1482d108924934c0f70cb"/>
+  <project name="platform/packages/apps/Camera" path="packages/apps/Camera" revision="8ff2adc739ca898d0230c702eed7d327e5bbf4dc"/>
+  <project name="platform/packages/apps/CellBroadcastReceiver" path="packages/apps/CellBroadcastReceiver" revision="50a624a47ce645a7992e346e40a4e7ec5e0df9b7"/>
+  <project name="platform/packages/apps/CertInstaller" path="packages/apps/CertInstaller" revision="457ffda6726b8e0f88d78a9267b840d102a8907a"/>
+  <project name="platform/packages/apps/Contacts" path="packages/apps/Contacts" revision="ec0e540fb20a31f77ca561bc4a872e817195627a"/>
+  <project name="platform/packages/apps/DeskClock" path="packages/apps/DeskClock" revision="8e1921f8140f205c115582e4a068c7ba5e79ff9c"/>
+  <project name="platform/packages/apps/Email" path="packages/apps/Email" revision="8c23a70b9123b77511e3ed9bbe827fe0c26bb674"/>
+  <project name="platform/packages/apps/Gallery" path="packages/apps/Gallery" revision="ea32625b6296585a0328886c33159d88e3a2c693"/>
+  <project name="platform/packages/apps/Gallery3D" path="packages/apps/Gallery3D" revision="87a545419820bc665d8fdb13845b65cf9707a7d8"/>
+  <project name="platform/packages/apps/HTMLViewer" path="packages/apps/HTMLViewer" revision="f470146b74d34c21e4d3526574e2bbd0e72a57f0"/>
+  <project name="platform/packages/apps/Launcher2" path="packages/apps/Launcher2" revision="3fd010a6fe457a59d2e983a348e63dc25e836852"/>
+  <project name="platform/packages/apps/Mms" path="packages/apps/Mms" revision="fd1766e6613390ac9d7c0dd8feac8708fa023a2b"/>
+  <project name="platform/packages/apps/Music" path="packages/apps/Music" revision="278aaed1eb37763f7dcb2364523db591014a9210"/>
+  <project name="platform/packages/apps/Nfc" path="packages/apps/Nfc" revision="e4d9ddebb676325c6abfe3b0d4c0aefa8a17d952"/>
+  <project name="platform/packages/apps/PackageInstaller" path="packages/apps/PackageInstaller" revision="6d2974c3f346511f96eba3370398123422e578fc"/>
+  <project name="platform/packages/apps/Phone" path="packages/apps/Phone" revision="54c42aebae50804cb620a35f0f82dd2ce2187e53"/>
+  <project name="platform/packages/apps/Protips" path="packages/apps/Protips" revision="a853d2b914144dd1f2ff3f03170f67d74338815d"/>
+  <project name="platform/packages/apps/QuickSearchBox" path="packages/apps/QuickSearchBox" revision="e8b28b6f1cab74060ea3101b1eee1dfdb32c89e9"/>
+  <project name="platform/packages/apps/Settings" path="packages/apps/Settings" remote="linaro-android" revision="ee25812a8eda802cc144dc416f2dca88d421bcef"/>
+  <project name="platform/packages/apps/SmartCardService" path="packages/apps/SmartCardService" revision="29eae320a4bd222b5ff1c092f84f1aebba88d0b7"/>
+  <project name="platform/packages/apps/SoundRecorder" path="packages/apps/SoundRecorder" revision="20b07a73ec046d23f5cfabaf60d54feb868a5eea"/>
+  <project name="platform/packages/apps/SpeechRecorder" path="packages/apps/SpeechRecorder" revision="f075eb5cefb6357aa7562a6d156bda5383ac087d"/>
+  <project name="platform/packages/apps/Stk" path="packages/apps/Stk" revision="d2f267c7ed48dc77878299e12925bc3c39db5d37"/>
+  <project name="platform/packages/apps/Tag" path="packages/apps/Tag" revision="4b1e01421a564b348fcf7c0203dcb89576883aff"/>
+  <project name="platform/packages/apps/VoiceDialer" path="packages/apps/VoiceDialer" revision="13b6acf2174e8dc23f70def279c85d191c3fcbc1"/>
+  <project name="platform/packages/experimental" path="packages/experimental" revision="504fe3ddddf722e4315b382319970b0e435af27b"/>
+  <project name="platform/packages/inputmethods/LatinIME" path="packages/inputmethods/LatinIME" revision="ec622ced359cfe646efc14b68e25539fa7a438d9"/>
+  <project name="platform/packages/inputmethods/OpenWnn" path="packages/inputmethods/OpenWnn" revision="27ab9d1b806f03554d2abb50de26abe7bf234336"/>
+  <project name="platform/packages/inputmethods/PinyinIME" path="packages/inputmethods/PinyinIME" revision="6b7954e2967754a77c55dc4291941978e3508259"/>
+  <project name="platform/packages/providers/ApplicationsProvider" path="packages/providers/ApplicationsProvider" revision="0234d298ecdffe3a10877d6edffe98e299713caa"/>
+  <project name="platform/packages/providers/CalendarProvider" path="packages/providers/CalendarProvider" revision="959739d351af5d04e8c92f6b031f737348d4b139"/>
+  <project name="platform/packages/providers/ContactsProvider" path="packages/providers/ContactsProvider" revision="c9d8e21bd1e6dbde3208b9475a2697081f8ced79"/>
+  <project name="platform/packages/providers/DownloadProvider" path="packages/providers/DownloadProvider" revision="abb94fb35445de2eadd1804ad2f4023bd50a6b5c"/>
+  <project name="platform/packages/providers/DrmProvider" path="packages/providers/DrmProvider" revision="42f3f2cbfecbbca1d18a5ff91e12619eba740516"/>
+  <project name="platform/packages/providers/GoogleContactsProvider" path="packages/providers/GoogleContactsProvider" revision="4886c7a0cfba5df74b213b1fc8286c6e3f2ddaa2"/>
+  <project name="platform/packages/providers/MediaProvider" path="packages/providers/MediaProvider" revision="2b0e56b7595da308d61d190b529518cdefc98acd"/>
+  <project name="platform/packages/providers/TelephonyProvider" path="packages/providers/TelephonyProvider" revision="6a5c080b90613c5afef04d453ab1498d22aee0a9"/>
+  <project name="platform/packages/providers/UserDictionaryProvider" path="packages/providers/UserDictionaryProvider" revision="d7eb9d4b59640175877a6f53f32b6e3e3d7154e9"/>
+  <project name="platform/packages/wallpapers/Basic" path="packages/wallpapers/Basic" revision="17db0721c8ef2d4f2c6835afaa3c47464730d9b1"/>
+  <project name="platform/packages/wallpapers/LivePicker" path="packages/wallpapers/LivePicker" revision="c114657db62c84b3b10c4e7d879d90ca5fc81d20"/>
+  <project name="platform/packages/wallpapers/MagicSmoke" path="packages/wallpapers/MagicSmoke" revision="4cb26a827ca03cad77522862cc78248e052ea0ca"/>
+  <project name="platform/packages/wallpapers/MusicVisualization" path="packages/wallpapers/MusicVisualization" revision="6759a52f863f60a67941938bd8d4610b01f9d2aa"/>
+  <project name="platform/prebuilt" path="prebuilt" revision="6b399f3609ac871310e9e51ff76393be605c6088"/>
+  <project name="platform/sdk" path="sdk" revision="dee444f860076b07d4b751fa64aba6683b4c377d"/>
+  <project name="platform/system/bluetooth" path="system/bluetooth" revision="7dc550597f490a67c8d020c727bfbf2d9d212d42"/>
+  <project name="platform/system/core" path="system/core" remote="linaro-android" revision="474bcaf1cbf12ff9007181a8093d2c12bc49d5b1"/>
+  <project name="platform/system/extras" path="system/extras" revision="8bdbbe2de23a8a8fc26b7f3a4b7dfdbe1112ac9f"/>
+  <project name="platform/system/media" path="system/media" remote="linaro-android" revision="bb5a707fe803083070c0d7ce475a0b898a522c22"/>
+  <project name="platform/system/netd" path="system/netd" revision="4415a6992691845c86bbb7b8ac9bd4c620338daa"/>
+  <project name="platform/system/vold" path="system/vold" remote="linaro-android" revision="119e194d52621f51892a0c7397f11637c0a5ec69"/>
+  <project name="x-loader/x-loader" path="device/linaro/x-loader" remote="gitorious" revision="c4289f1bee035dea41536c5ba5e1bc36c7d493c4"/>
 </manifest>
diff --git a/landing-snowball.xml b/landing-snowball.xml
index 4bfc5a44e..351b356f5 100644
--- a/landing-snowball.xml
+++ b/landing-snowball.xml
@@ -1,218 +1,190 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
-  <remote  name="korg"
-           fetch="git://android.git.linaro.org/"
-           review="review.android.git.linaro.org" />
-  <default revision="refs/tags/android-2.3.5_r1"
-           remote="korg" />
-
-  <remote  name="linaro-android"
-           fetch="git://android.git.linaro.org/"
-           review="review.android.git.linaro.org" />
-
-  <remote  name="linaro-other"
-           fetch="git://git.linaro.org/" />
-
-  <remote  name="0xbench"
-           fetch="git://gitorious.org/0xbench/" />
-
-  <remote  name="gitorious"
-           fetch="git://gitorious.org/" />
-
-  <remote  name="igloocommunity"
-           fetch="git://igloocommunity.org/" />
-
-  <!-- Linaro changes -->
-  <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_2.3.5" remote="linaro-android" />
-
-  <project path="device/linaro/beagleboard" name="device/linaro/beagleboard" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="device/linaro/pandaboard" name="device/linaro/pandaboard" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="device/linaro/u8500href" name="device/linaro/u8500href" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="device/linaro/snowball" name="device/linaro/snowball" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="device/linaro/common" name="device/linaro/common" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="system/vold" name="platform/system/vold" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="system/core" name="platform/system/core" revision="linaro_android_2.3.5" remote="linaro-android" />
-
-  <project path="dalvik" name="platform/dalvik" revision="linaro_android_2.3.5" remote="linaro-android"/>
-  <project path="external/elfcopy" name="platform/external/elfcopy" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/skia" name="platform/external/skia" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="frameworks/opt/emoji" name="platform/frameworks/opt/emoji" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="libcore" name="platform/libcore" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="system/media" name="platform/system/media" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/svox" name="platform/external/svox" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/busybox" name="platform/external/busybox" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="hardware/libhardware" name="platform/hardware/libhardware" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project name="people/kwerner/libunwind" path="external/libunwind" remote="linaro-other" revision="fc05b927bc13c00d38a540f603f4fcb4f7325846" />
-
-  <!-- Multimedia extensions -->
-  <project path="external/libvpx" name="platform/external/libvpx" revision="linaro-master" remote="linaro-android" />
-  <project path="external/x264" name="platform/external/x264" revision="linaro-master" remote="linaro-android" />
-  <project path="external/ffmpeg" name="platform/external/ffmpeg" revision="linaro-0.8" remote="linaro-android" />
-
-  <!-- Power WG -->
-  <project path="external/powertop" name="platform/external/powertop"  remote="linaro-android" revision="linaro" />
-  <project path="external/ncurses" name="platform/external/ncurses"  remote="linaro-android" revision="linaro" />
-  <project path="external/libnl" name="platform/external/libnl"  remote="linaro-android" revision="linaro" />
-
-  <project path="build" name="platform/build" revision="linaro_android_2.3.5" remote="linaro-android" >
-    <copyfile src="core/root.mk" dest="Makefile" />
+  <remote fetch="git://gitorious.org/0xbench/" name="0xbench"/>
+  <remote fetch="git://gitorious.org/" name="gitorious"/>
+  <remote fetch="git://igloocommunity.org/" name="igloocommunity"/>
+  <remote fetch="git://android.git.linaro.org/" name="korg" review="review.android.git.linaro.org"/>
+  <remote fetch="git://android.git.linaro.org/" name="linaro-android" review="review.android.git.linaro.org"/>
+  <remote fetch="git://git.linaro.org/" name="linaro-other"/>
+
+  <default remote="korg" revision="refs/tags/android-2.3.5_r1"/>
+
+  <project name="0xbench" path="packages/apps/0xbench" remote="0xbench" revision="1772a907e73e188317c60d5d9561551e5d9b6c5f"/>
+  <project name="bsp/st-ericsson/linux-3.0-android-ux500" path="kernel" remote="linaro-other" revision="2036fd76350799bb2b53b309d0ac6d60692fe890"/>
+  <project name="device/common" revision="3b932551eb896cd1880e65b156059a5f34d2f655"/>
+  <project name="device/google/accessory/arduino" revision="ee3bb7c351e732e8f518cde0238bf9b3d810d80a"/>
+  <project name="device/google/accessory/demokit" revision="37921cd911a238cee5d79c6f63f84304c1ca36e0"/>
+  <project name="device/linaro/beagleboard" remote="linaro-android" revision="5029d2ca236dd840e9b2785ff4daeb7c9b627995"/>
+  <project name="device/linaro/common" remote="linaro-android" revision="1550de16d8bf3e80b333b73ee1dec7750fe552f8"/>
+  <project name="device/linaro/pandaboard" remote="linaro-android" revision="5dac14677e208091d28f540a38e98f8152e93b58"/>
+  <project name="device/linaro/snowball" remote="linaro-android" revision="1110f467b89da988c49079e8ddb769f27f327f87"/>
+  <project name="device/linaro/u8500href" remote="linaro-android" revision="b316efeb3147ee8e236db39192671595570b783b"/>
+  <project name="device/sample" revision="e04c7b12e187584785a038e586b8aeccc82b33d0"/>
+  <project name="device/samsung/crespo" revision="6a740e418e0a2a9beddc4f31ee6607e90d420b17"/>
+  <project name="git/boot/u-boot-ux500" path="u-boot" remote="igloocommunity" revision="0eb625e4f87a10e8850526a587287fc31b269110"/>
+  <project name="people/afrantzis/glmark2" path="packages/apps/glmark2" remote="linaro-other" revision="e3727c42da8cf7dd554df5d25c6ee249bad0a452"/>
+  <project name="people/bernhardrosenkranzer/mmtest" path="packages/apps/mmtest" remote="linaro-other" revision="7caaadf7a48c0322693f226d7a78b78f853d51c0"/>
+  <project name="people/kwerner/libunwind" path="external/libunwind" remote="linaro-other" revision="fc05b927bc13c00d38a540f603f4fcb4f7325846"/>
+  <project name="people/tomgall/libjpeg-turbo/libjpeg-turbo" path="external/jpeg" remote="linaro-other" revision="0206f26bd4229243a87b3519d251f9e4947b6b2a"/>
+  <project name="platform/bionic" path="bionic" remote="linaro-android" revision="46e1d893c41c20e3d348fb64414b8294a3eebcb2"/>
+  <project name="platform/bootable/bootloader/legacy" path="bootable/bootloader/legacy" revision="d3271024770ddcc2fb87dd22f8280764545ab05a"/>
+  <project name="platform/bootable/diskinstaller" path="bootable/diskinstaller" revision="53bd9111b5ae1fc1180ec13755d9830f7cadacf5"/>
+  <project name="platform/bootable/recovery" path="bootable/recovery" revision="7172eb7b623f4b30f5a709d639fcd3fb51cd6220"/>
+  <project name="platform/build" path="build" remote="linaro-android" revision="edec05c8c7186bea4befcf95054548db3a0143f9">
+    <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-
-  <project path="kernel" name="bsp/st-ericsson/linux-3.0-android-ux500" revision="master" remote="linaro-other" />
-  <project path="u-boot" name="git/boot/u-boot-ux500" revision="master" remote="igloocommunity" />
-
-  <project path="packages/apps/0xbench" name="0xbench" revision="master" remote="0xbench" />
-  <project path="packages/apps/mmtest" name="people/bernhardrosenkranzer/mmtest" revision="master" remote="linaro-other" />
-  <project path="packages/apps/glmark2" name="people/afrantzis/glmark2" revision="master" remote="linaro-other" />
-  <project path="external/jpeg" name="people/tomgall/libjpeg-turbo/libjpeg-turbo" revision="1.2-beta-linaro-andoid" remote="linaro-other" />
-  <project path="external/dbus" name="platform/external/dbus" revision="linaro-master" remote="linaro-android" />
-  <project path="bionic" name="platform/bionic" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/fdlibm" name="platform/external/fdlibm" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/icu4c" name="platform/external/icu4c" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/iptables" name="platform/external/iptables" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_2.3.5" remote="linaro-android" />
-
-  <!-- x-loader -->
-  <project path="device/linaro/x-loader" name="x-loader/x-loader" revision="master" remote="gitorious" />
-
-  <!-- standard Andorid manifest -->
-  <project path="bootable/bootloader/legacy" name="platform/bootable/bootloader/legacy" />
-  <project path="bootable/diskinstaller" name="platform/bootable/diskinstaller" />
-  <project path="bootable/recovery" name="platform/bootable/recovery" />
-  <project path="cts" name="platform/cts" />
-  <project path="development" name="platform/development" />
-  <project path="device/common" name="device/common" />
-  <project path="device/google/accessory/arduino" name="device/google/accessory/arduino" />
-  <project path="device/google/accessory/demokit" name="device/google/accessory/demokit" />
-  <project path="device/sample" name="device/sample" />
-  <project path="device/samsung/crespo" name="device/samsung/crespo" />
-  <project path="external/apache-http" name="platform/external/apache-http" />
-  <project path="external/astl" name="platform/external/astl" />
-  <project path="external/bison" name="platform/external/bison" />
-  <project path="external/blktrace" name="platform/external/blktrace" />
-  <project path="external/bluetooth/bluez" name="platform/external/bluetooth/bluez" />
-  <project path="external/bluetooth/glib" name="platform/external/bluetooth/glib" />
-  <project path="external/bluetooth/hcidump" name="platform/external/bluetooth/hcidump" />
-  <project path="external/bouncycastle" name="platform/external/bouncycastle" />
-  <project path="external/bsdiff" name="platform/external/bsdiff" />
-  <project path="external/bzip2" name="platform/external/bzip2" />
-  <project path="external/chromium" name="platform/external/chromium" />
-  <project path="external/clearsilver" name="platform/external/clearsilver" />
-  <project path="external/dhcpcd" name="platform/external/dhcpcd" />
-  <project path="external/dropbear" name="platform/external/dropbear" />
-  <project path="external/e2fsprogs" name="platform/external/e2fsprogs" />
-  <project path="external/easymock" name="platform/external/easymock" />
-  <project path="external/elfutils" name="platform/external/elfutils" />
-  <project path="external/embunit" name="platform/external/embunit" />
-  <project path="external/emma" name="platform/external/emma" />
-  <project path="external/esd" name="platform/external/esd" />
-  <project path="external/expat" name="platform/external/expat" />
-  <project path="external/freetype" name="platform/external/freetype" />
-  <project path="external/fsck_msdos" name="platform/external/fsck_msdos" />
-  <project path="external/genext2fs" name="platform/external/genext2fs" />
-  <project path="external/giflib" name="platform/external/giflib" />
-  <project path="external/grub" name="platform/external/grub" />
-  <project path="external/gtest" name="platform/external/gtest" />
-  <project path="external/guava" name="platform/external/guava" />
-  <project path="external/iproute2" name="platform/external/iproute2" />
-  <project path="external/ipsec-tools" name="platform/external/ipsec-tools" />
-  <project path="external/jdiff" name="platform/external/jdiff" />
-  <project path="external/jhead" name="platform/external/jhead" />
-  <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/libgsm" name="platform/external/libgsm" />
-  <project path="external/libnfc-nxp" name="platform/external/libnfc-nxp" />
-  <project path="external/libpcap" name="platform/external/libpcap" />
-  <project path="external/libpng" name="platform/external/libpng" />
-  <project path="external/libxml2" name="platform/external/libxml2" />
-  <project path="external/mtpd" name="platform/external/mtpd" />
-  <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/nist-sip" name="platform/external/nist-sip" />
-  <project path="external/oauth" name="platform/external/oauth" />
-  <project path="external/openssl" name="platform/external/openssl" />
-  <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/protobuf" name="platform/external/protobuf" />
-  <project path="external/qemu" name="platform/external/qemu" />
-  <project path="external/quake" name="platform/external/quake" />
-  <project path="external/safe-iop" name="platform/external/safe-iop" />
-  <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/strace" name="platform/external/strace" />
-  <project path="external/tagsoup" name="platform/external/tagsoup" />
-  <project path="external/tinyxml" name="platform/external/tinyxml" />
-  <project path="external/tremolo" name="platform/external/tremolo" />
-  <project path="external/v8" name="platform/external/v8" />
-  <project path="external/wpa_supplicant" name="platform/external/wpa_supplicant" />
-  <project path="external/wpa_supplicant_6" name="platform/external/wpa_supplicant_6" />
-  <project path="external/xmlwriter" name="platform/external/xmlwriter" />
-  <project path="external/yaffs2" name="platform/external/yaffs2" />
-  <project path="external/zlib" name="platform/external/zlib" />
-  <project path="frameworks/ex" name="platform/frameworks/ex" />
-  <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" />
-  <project path="hardware/ril" name="platform/hardware/ril" />
-  <project path="ndk" name="platform/ndk" />
-  <project path="packages/apps/AccountsAndSyncSettings" name="platform/packages/apps/AccountsAndSyncSettings" />
-  <project path="packages/apps/Bluetooth" name="platform/packages/apps/Bluetooth" />
-  <project path="packages/apps/Browser" name="platform/packages/apps/Browser" />
-  <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="platform/packages/apps/Camera" />
-  <project path="packages/apps/CellBroadcastReceiver" name="platform/packages/apps/CellBroadcastReceiver" />
-  <project path="packages/apps/CertInstaller" name="platform/packages/apps/CertInstaller" />
-  <project path="packages/apps/Contacts" name="platform/packages/apps/Contacts" />
-  <project path="packages/apps/DeskClock" name="platform/packages/apps/DeskClock" />
-  <project path="packages/apps/Email" name="platform/packages/apps/Email" />
-  <project path="packages/apps/Gallery" name="platform/packages/apps/Gallery" />
-  <project path="packages/apps/Gallery3D" name="platform/packages/apps/Gallery3D" />
-  <project path="packages/apps/HTMLViewer" name="platform/packages/apps/HTMLViewer" />
-  <project path="packages/apps/Launcher2" name="platform/packages/apps/Launcher2" />
-  <project path="packages/apps/Mms" name="platform/packages/apps/Mms" />
-  <project path="packages/apps/Music" name="platform/packages/apps/Music" />
-  <project path="packages/apps/Nfc" name="platform/packages/apps/Nfc" />
-  <project path="packages/apps/PackageInstaller" name="platform/packages/apps/PackageInstaller" />
-  <project path="packages/apps/Phone" name="platform/packages/apps/Phone" />
-  <project path="packages/apps/Protips" name="platform/packages/apps/Protips" />
-  <project path="packages/apps/QuickSearchBox" name="platform/packages/apps/QuickSearchBox" />
-  <project path="packages/apps/SmartCardService" name="platform/packages/apps/SmartCardService" />
-  <project path="packages/apps/SoundRecorder" name="platform/packages/apps/SoundRecorder" />
-  <project path="packages/apps/SpeechRecorder" name="platform/packages/apps/SpeechRecorder" />
-  <project path="packages/apps/Stk" name="platform/packages/apps/Stk" />
-  <project path="packages/apps/Tag" name="platform/packages/apps/Tag" />
-  <project path="packages/apps/VoiceDialer" name="platform/packages/apps/VoiceDialer" />
-  <project path="packages/experimental" name="platform/packages/experimental" />
-  <project path="packages/inputmethods/LatinIME" name="platform/packages/inputmethods/LatinIME" />
-  <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="platform/packages/providers/DownloadProvider" />
-  <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="platform/packages/providers/MediaProvider" />
-  <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="platform/packages/wallpapers/Basic" />
-  <project path="packages/wallpapers/LivePicker" name="platform/packages/wallpapers/LivePicker" />
-  <project path="packages/wallpapers/MagicSmoke" name="platform/packages/wallpapers/MagicSmoke" />
-  <project path="packages/wallpapers/MusicVisualization" name="platform/packages/wallpapers/MusicVisualization" />
-  <project path="prebuilt" name="platform/prebuilt" />
-  <project path="sdk" name="platform/sdk" />
-  <project path="system/bluetooth" name="platform/system/bluetooth" />
-  <project path="system/extras" name="platform/system/extras" />
-  <project path="system/netd" name="platform/system/netd" />
-
+  <project name="platform/cts" path="cts" revision="6b4d831147bd65bc5a3d3e23c05626c831151615"/>
+  <project name="platform/dalvik" path="dalvik" remote="linaro-android" revision="87dc8dd69f81bb07007969dee9e71bce7fa82807"/>
+  <project name="platform/development" path="development" revision="f60f95391262f2295b9173e23a9344c8322d604a"/>
+  <project name="platform/external/apache-http" path="external/apache-http" revision="b91c5e936342afbdd58c88ac604d5dd505d0fe0c"/>
+  <project name="platform/external/astl" path="external/astl" revision="c3c760978c34d5eeea1205c0bf7f27444e192a98"/>
+  <project name="platform/external/bison" path="external/bison" revision="889df9c1efa7ca5de113407ab7793b57a6db677d"/>
+  <project name="platform/external/blktrace" path="external/blktrace" revision="ac4461c3b3e7bcbafe5336b9478657d0fa3e08aa"/>
+  <project name="platform/external/bluetooth/bluez" path="external/bluetooth/bluez" revision="02e98694ef87ea8ecb47789abf89c3f945ee0e20"/>
+  <project name="platform/external/bluetooth/glib" path="external/bluetooth/glib" revision="0c01eb3a7313a580fe34044bcdc3337d067c8a15"/>
+  <project name="platform/external/bluetooth/hcidump" path="external/bluetooth/hcidump" revision="ce36a6c7c5f8043c038415d8e270d55d9834008d"/>
+  <project name="platform/external/bouncycastle" path="external/bouncycastle" revision="3ab12958718f17e48e2816a84d403f6305cc2800"/>
+  <project name="platform/external/bsdiff" path="external/bsdiff" revision="df980d633fd0bdc0b89af26630f543d91bb87e68"/>
+  <project name="platform/external/busybox" path="external/busybox" remote="linaro-android" revision="496c5fca645e6b724b162e66931e446a85fc49d3"/>
+  <project name="platform/external/bzip2" path="external/bzip2" revision="879585bbef51b4cabaac6340a95d807dca379cdc"/>
+  <project name="platform/external/chromium" path="external/chromium" revision="5e43ad9465e402d595a3c960784b1effe2e9bd88"/>
+  <project name="platform/external/clearsilver" path="external/clearsilver" revision="3e15867df7fb41770c090ee40411a6c376574ae3"/>
+  <project name="platform/external/dbus" path="external/dbus" remote="linaro-android" revision="97b3dae199a09f003fd60fe63f1b17ec0fa5fb76"/>
+  <project name="platform/external/dhcpcd" path="external/dhcpcd" revision="17fdc0dee1db0246a59cd3b28278389043fe5134"/>
+  <project name="platform/external/dnsmasq" path="external/dnsmasq" remote="linaro-android" revision="ebf5da42ba598621e9dbb878196254e83c91d8fc"/>
+  <project name="platform/external/dropbear" path="external/dropbear" revision="d3a3a803df8f32e9ba26758b3a9d7fbd27a3dc9c"/>
+  <project name="platform/external/e2fsprogs" path="external/e2fsprogs" revision="6641b4da8001b46fd17e723a572459db0325e023"/>
+  <project name="platform/external/easymock" path="external/easymock" revision="17d5eb4006c438775d8eaa7600e947e4ac090a18"/>
+  <project name="platform/external/elfcopy" path="external/elfcopy" remote="linaro-android" revision="0513f4c3119ad2ca0b302eedefc58cc7f470d6de"/>
+  <project name="platform/external/elfutils" path="external/elfutils" revision="84cf4183ba6f577ee01abe7f1f5a6d4b23df35a8"/>
+  <project name="platform/external/embunit" path="external/embunit" revision="f5eb8b0c9abf1e9911b5c84a555bc495651595e5"/>
+  <project name="platform/external/emma" path="external/emma" revision="4d37e21b7c2fa378dbf7cfe2ea57d7f5991fe6cd"/>
+  <project name="platform/external/esd" path="external/esd" revision="224a67f2683a7ee997179fc5dd16115e39987b0f"/>
+  <project name="platform/external/expat" path="external/expat" revision="204e2ef0e1a2c2da0087cccb0c9b618d52f1d584"/>
+  <project name="platform/external/fdlibm" path="external/fdlibm" remote="linaro-android" revision="a74d3139b5e2046e52a94f6b1510d5e3d15c2bc1"/>
+  <project name="platform/external/ffmpeg" path="external/ffmpeg" remote="linaro-android" revision="6d020211c1fb464b956c203e6cc5a0e157d1eb13"/>
+  <project name="platform/external/freetype" path="external/freetype" revision="aacb8e1368a883fcbc9fe64fd0e460cef9c9b20c"/>
+  <project name="platform/external/fsck_msdos" path="external/fsck_msdos" revision="b6ee08aadb580341a4d80943741b80de16a88b5d"/>
+  <project name="platform/external/genext2fs" path="external/genext2fs" revision="28f10892a39db10b1c65125723d9737de865ef56"/>
+  <project name="platform/external/giflib" path="external/giflib" revision="b2597268aef084202a8c349d1cc072c03c6e22eb"/>
+  <project name="platform/external/grub" path="external/grub" revision="a0be411871f2e71834a2cd75dea882d732557530"/>
+  <project name="platform/external/gtest" path="external/gtest" revision="75f109c3120bf78ee89124f1f21b50ea24225236"/>
+  <project name="platform/external/guava" path="external/guava" revision="5fa17bce47c47d5538beaaef0e38f0576446709c"/>
+  <project name="platform/external/icu4c" path="external/icu4c" remote="linaro-android" revision="0fd910cf8e8f3681d7a727f09273ce76dbfe4ec9"/>
+  <project name="platform/external/iproute2" path="external/iproute2" revision="14740a4557728ba63348e0574507a71fa40a8bd4"/>
+  <project name="platform/external/ipsec-tools" path="external/ipsec-tools" revision="f5d0d0919f6c0b82611c1f8ad0cb6023a78b6ce0"/>
+  <project name="platform/external/iptables" path="external/iptables" remote="linaro-android" revision="4ebfa4c82fc82e25e1206a9197809062d5d4f306"/>
+  <project name="platform/external/jdiff" path="external/jdiff" revision="590cef7c1b48c9c3f4556ae65fbc0065d65da54a"/>
+  <project name="platform/external/jhead" path="external/jhead" revision="fd983181d9043cdf45497ace19c60fd9e4e1799c"/>
+  <project name="platform/external/jsr305" path="external/jsr305" revision="8e937939899d5fe3a6864c7ecb9bb8632678a7c7"/>
+  <project name="platform/external/junit" path="external/junit" revision="e9b8080d6d80d17729e0b7f8b1d2b573b3456cc4"/>
+  <project name="platform/external/kernel-headers" path="external/kernel-headers" revision="8abdcd4098f266e438e7129a3dfe311005686431"/>
+  <project name="platform/external/libffi" path="external/libffi" revision="5dea54fd57265ce037ac94055b9f94a45558b39e"/>
+  <project name="platform/external/libgsm" path="external/libgsm" revision="5e4516958690b9a1b2c98f88eeecba3edd2dbda4"/>
+  <project name="platform/external/libnfc-nxp" path="external/libnfc-nxp" revision="178bcc31188d60d13e7455c14e9fd902f5505331"/>
+  <project name="platform/external/libnl" path="external/libnl" remote="linaro-android" revision="bbcb553f0f4636dd40e84d320a576b3de7b95357"/>
+  <project name="platform/external/libpcap" path="external/libpcap" revision="3a7bce5dda6a8db92c9248846d0255e68c3a5b2a"/>
+  <project name="platform/external/libpng" path="external/libpng" revision="4ce0ee15f268e0161438b4133936cb2826f7fd50"/>
+  <project name="platform/external/libvpx" path="external/libvpx" remote="linaro-android" revision="62644e5902d0ea9de45ed57442587020a21115e7"/>
+  <project name="platform/external/libxml2" path="external/libxml2" revision="f16b5fdc2102953f6b915472200061e17e76702b"/>
+  <project name="platform/external/mtpd" path="external/mtpd" revision="fccbc17685cd8bd43cf1c1e533c4d02f6f79d667"/>
+  <project name="platform/external/ncurses" path="external/ncurses" remote="linaro-android" revision="5fc466743430377a29b0dc6a38b0d1de843581e7"/>
+  <project name="platform/external/netcat" path="external/netcat" revision="fc2dc55c510657073ef4235658167a878e82cefa"/>
+  <project name="platform/external/netperf" path="external/netperf" revision="58ecd3b7c76263900e38921360e334a416aec362"/>
+  <project name="platform/external/neven" path="external/neven" revision="7164d6ac08ab9fc1247aa29f1dafd0ef7808f0f2"/>
+  <project name="platform/external/nist-sip" path="external/nist-sip" revision="a58e4068f86c6ca3f9771d4ec8b2665d070a170e"/>
+  <project name="platform/external/oauth" path="external/oauth" revision="c76276a1d6165cfb502b06f65b1735fef0754d26"/>
+  <project name="platform/external/openssl" path="external/openssl" revision="f07bf9fa6a96c0039e832242569c8e6fc40c9a94"/>
+  <project name="platform/external/oprofile" path="external/oprofile" revision="041ee6ccda354960ebc1e1ccfff78685ec5326e1"/>
+  <project name="platform/external/ping" path="external/ping" revision="f35ea57ab6d01badde92491274ff2d74cbe3cf01"/>
+  <project name="platform/external/powertop" path="external/powertop" remote="linaro-android" revision="3d1c205aabb9a0451c6b3fe7846e8cce5521c727"/>
+  <project name="platform/external/ppp" path="external/ppp" revision="d88bff8f5384285f76576eb7707c6d9d5b98edb6"/>
+  <project name="platform/external/proguard" path="external/proguard" revision="6660cb6cb4231a03a3c02127fa5c4e7828422caa"/>
+  <project name="platform/external/protobuf" path="external/protobuf" revision="3574de1ca8301e1e13d1c89f2e2a902499d6bae9"/>
+  <project name="platform/external/qemu" path="external/qemu" revision="2fa5173bd1ce7341c50adac676a317945f0969c7"/>
+  <project name="platform/external/quake" path="external/quake" revision="9b0abf864353d47404417c1cbd8384e15be547b0"/>
+  <project name="platform/external/safe-iop" path="external/safe-iop" revision="07073634e2e3aa4f518e36ed5dec3aabc549d5fb"/>
+  <project name="platform/external/skia" path="external/skia" remote="linaro-android" revision="b17b930777b5c84e9a8048147577646a58a6a0fc"/>
+  <project name="platform/external/sonivox" path="external/sonivox" revision="d029b2378170cfd7bb34d894482065a762a54578"/>
+  <project name="platform/external/speex" path="external/speex" revision="32e4d0aa78c5879565cbcd06415fa2e344036ab5"/>
+  <project name="platform/external/sqlite" path="external/sqlite" revision="90f23688416d9f4e1e5d0128dca5f26404b6898e"/>
+  <project name="platform/external/srec" path="external/srec" revision="7390035ea61b32477243d60c452664150b61f023"/>
+  <project name="platform/external/stlport" path="external/stlport" remote="linaro-android" revision="f56d1f0242e7eb2800f552e3c3c562b02c26b2b2"/>
+  <project name="platform/external/strace" path="external/strace" revision="cfa96b379cdd6561a5cc89f2bb86ee9f4b2a3928"/>
+  <project name="platform/external/svox" path="external/svox" remote="linaro-android" revision="c54cda009637d7be08e4cd5b829ec0fc3079f60f"/>
+  <project name="platform/external/tagsoup" path="external/tagsoup" revision="68c2ec9e0acdb3214b7fb91dbab8c9fab8736817"/>
+  <project name="platform/external/tcpdump" path="external/tcpdump" remote="linaro-android" revision="616015d52648c7eb6460eb6411aa87581cbb0e13"/>
+  <project name="platform/external/tinyxml" path="external/tinyxml" revision="d589f7e4a51e75bd5c98a3defd8ee84d7059e86e"/>
+  <project name="platform/external/tremolo" path="external/tremolo" revision="9a688754461ebfc91769b5d3c8ba5aba9fe1f376"/>
+  <project name="platform/external/v8" path="external/v8" revision="6599b9dd3411791c9d89ab7efbfb4131e5664c48"/>
+  <project name="platform/external/webkit" path="external/webkit" remote="linaro-android" revision="1e02484fcaef9e1ea900b6e3323b8907c79b4bb2"/>
+  <project name="platform/external/wpa_supplicant" path="external/wpa_supplicant" revision="2b7ee495307e9fd349a0f37ec560834adbc954cc"/>
+  <project name="platform/external/wpa_supplicant_6" path="external/wpa_supplicant_6" revision="b2522a100c9c6688508261b04e83fa1d0bdc88ab"/>
+  <project name="platform/external/x264" path="external/x264" remote="linaro-android" revision="c8be2223e23a49c852557881d8210a70aae9cb5c"/>
+  <project name="platform/external/xmlwriter" path="external/xmlwriter" revision="e95d92246ee35273dde2bee8b00485cc14c12be5"/>
+  <project name="platform/external/yaffs2" path="external/yaffs2" revision="0fe811d9a994dd6df8aa9852c7b9241fa9aa453b"/>
+  <project name="platform/external/zlib" path="external/zlib" revision="96c70b1df1629d7f0eb8f666045bfd5eb062cebf"/>
+  <project name="platform/frameworks/base" path="frameworks/base" remote="linaro-android" revision="a08dc19c13967d6efa54443c21918288d5fb4178"/>
+  <project name="platform/frameworks/ex" path="frameworks/ex" revision="e0d5045a56146f0e7d8ea9e400f6eb209edceec5"/>
+  <project name="platform/frameworks/opt/emoji" path="frameworks/opt/emoji" remote="linaro-android" revision="941fb3d38928a8483701fe2be45ccbc6579f3633"/>
+  <project name="platform/hardware/libhardware" path="hardware/libhardware" remote="linaro-android" revision="f50b075a8b88eff482628e8ab62a04539117c7ea"/>
+  <project name="platform/hardware/libhardware_legacy" path="hardware/libhardware_legacy" revision="17f1ff8c99dada2cca93f68d434cf64a6dc692c2"/>
+  <project name="platform/hardware/ril" path="hardware/ril" revision="3b1530aef62476248825a2092c9aea800395c3b1"/>
+  <project name="platform/libcore" path="libcore" remote="linaro-android" revision="b390cef44c168f9a6cfa8b70cc7861869ab3be5d"/>
+  <project name="platform/ndk" path="ndk" revision="7a619be40e8594a961066a33b7cc9ef52f566988"/>
+  <project name="platform/packages/apps/AccountsAndSyncSettings" path="packages/apps/AccountsAndSyncSettings" revision="0179779e69d0a8ce2879cf27261af9bc2908cae0"/>
+  <project name="platform/packages/apps/Bluetooth" path="packages/apps/Bluetooth" revision="6d48feaaff63b14adc23e7b2d82854189a456f15"/>
+  <project name="platform/packages/apps/Browser" path="packages/apps/Browser" revision="7b6955578d914557eea7ff3cbcec70e953970092"/>
+  <project name="platform/packages/apps/Calculator" path="packages/apps/Calculator" revision="5c85e48a713ec70ebce65ebf1a3622035992f8c3"/>
+  <project name="platform/packages/apps/Calendar" path="packages/apps/Calendar" revision="ee794988e54a2e8172b1482d108924934c0f70cb"/>
+  <project name="platform/packages/apps/Camera" path="packages/apps/Camera" revision="8ff2adc739ca898d0230c702eed7d327e5bbf4dc"/>
+  <project name="platform/packages/apps/CellBroadcastReceiver" path="packages/apps/CellBroadcastReceiver" revision="50a624a47ce645a7992e346e40a4e7ec5e0df9b7"/>
+  <project name="platform/packages/apps/CertInstaller" path="packages/apps/CertInstaller" revision="457ffda6726b8e0f88d78a9267b840d102a8907a"/>
+  <project name="platform/packages/apps/Contacts" path="packages/apps/Contacts" revision="ec0e540fb20a31f77ca561bc4a872e817195627a"/>
+  <project name="platform/packages/apps/DeskClock" path="packages/apps/DeskClock" revision="8e1921f8140f205c115582e4a068c7ba5e79ff9c"/>
+  <project name="platform/packages/apps/Email" path="packages/apps/Email" revision="8c23a70b9123b77511e3ed9bbe827fe0c26bb674"/>
+  <project name="platform/packages/apps/Gallery" path="packages/apps/Gallery" revision="ea32625b6296585a0328886c33159d88e3a2c693"/>
+  <project name="platform/packages/apps/Gallery3D" path="packages/apps/Gallery3D" revision="87a545419820bc665d8fdb13845b65cf9707a7d8"/>
+  <project name="platform/packages/apps/HTMLViewer" path="packages/apps/HTMLViewer" revision="f470146b74d34c21e4d3526574e2bbd0e72a57f0"/>
+  <project name="platform/packages/apps/Launcher2" path="packages/apps/Launcher2" revision="3fd010a6fe457a59d2e983a348e63dc25e836852"/>
+  <project name="platform/packages/apps/Mms" path="packages/apps/Mms" revision="fd1766e6613390ac9d7c0dd8feac8708fa023a2b"/>
+  <project name="platform/packages/apps/Music" path="packages/apps/Music" revision="278aaed1eb37763f7dcb2364523db591014a9210"/>
+  <project name="platform/packages/apps/Nfc" path="packages/apps/Nfc" revision="e4d9ddebb676325c6abfe3b0d4c0aefa8a17d952"/>
+  <project name="platform/packages/apps/PackageInstaller" path="packages/apps/PackageInstaller" revision="6d2974c3f346511f96eba3370398123422e578fc"/>
+  <project name="platform/packages/apps/Phone" path="packages/apps/Phone" revision="54c42aebae50804cb620a35f0f82dd2ce2187e53"/>
+  <project name="platform/packages/apps/Protips" path="packages/apps/Protips" revision="a853d2b914144dd1f2ff3f03170f67d74338815d"/>
+  <project name="platform/packages/apps/QuickSearchBox" path="packages/apps/QuickSearchBox" revision="e8b28b6f1cab74060ea3101b1eee1dfdb32c89e9"/>
+  <project name="platform/packages/apps/Settings" path="packages/apps/Settings" remote="linaro-android" revision="ee25812a8eda802cc144dc416f2dca88d421bcef"/>
+  <project name="platform/packages/apps/SmartCardService" path="packages/apps/SmartCardService" revision="29eae320a4bd222b5ff1c092f84f1aebba88d0b7"/>
+  <project name="platform/packages/apps/SoundRecorder" path="packages/apps/SoundRecorder" revision="20b07a73ec046d23f5cfabaf60d54feb868a5eea"/>
+  <project name="platform/packages/apps/SpeechRecorder" path="packages/apps/SpeechRecorder" revision="f075eb5cefb6357aa7562a6d156bda5383ac087d"/>
+  <project name="platform/packages/apps/Stk" path="packages/apps/Stk" revision="d2f267c7ed48dc77878299e12925bc3c39db5d37"/>
+  <project name="platform/packages/apps/Tag" path="packages/apps/Tag" revision="4b1e01421a564b348fcf7c0203dcb89576883aff"/>
+  <project name="platform/packages/apps/VoiceDialer" path="packages/apps/VoiceDialer" revision="13b6acf2174e8dc23f70def279c85d191c3fcbc1"/>
+  <project name="platform/packages/experimental" path="packages/experimental" revision="504fe3ddddf722e4315b382319970b0e435af27b"/>
+  <project name="platform/packages/inputmethods/LatinIME" path="packages/inputmethods/LatinIME" revision="ec622ced359cfe646efc14b68e25539fa7a438d9"/>
+  <project name="platform/packages/inputmethods/OpenWnn" path="packages/inputmethods/OpenWnn" revision="27ab9d1b806f03554d2abb50de26abe7bf234336"/>
+  <project name="platform/packages/inputmethods/PinyinIME" path="packages/inputmethods/PinyinIME" revision="6b7954e2967754a77c55dc4291941978e3508259"/>
+  <project name="platform/packages/providers/ApplicationsProvider" path="packages/providers/ApplicationsProvider" revision="0234d298ecdffe3a10877d6edffe98e299713caa"/>
+  <project name="platform/packages/providers/CalendarProvider" path="packages/providers/CalendarProvider" revision="959739d351af5d04e8c92f6b031f737348d4b139"/>
+  <project name="platform/packages/providers/ContactsProvider" path="packages/providers/ContactsProvider" revision="c9d8e21bd1e6dbde3208b9475a2697081f8ced79"/>
+  <project name="platform/packages/providers/DownloadProvider" path="packages/providers/DownloadProvider" revision="abb94fb35445de2eadd1804ad2f4023bd50a6b5c"/>
+  <project name="platform/packages/providers/DrmProvider" path="packages/providers/DrmProvider" revision="42f3f2cbfecbbca1d18a5ff91e12619eba740516"/>
+  <project name="platform/packages/providers/GoogleContactsProvider" path="packages/providers/GoogleContactsProvider" revision="4886c7a0cfba5df74b213b1fc8286c6e3f2ddaa2"/>
+  <project name="platform/packages/providers/MediaProvider" path="packages/providers/MediaProvider" revision="2b0e56b7595da308d61d190b529518cdefc98acd"/>
+  <project name="platform/packages/providers/TelephonyProvider" path="packages/providers/TelephonyProvider" revision="6a5c080b90613c5afef04d453ab1498d22aee0a9"/>
+  <project name="platform/packages/providers/UserDictionaryProvider" path="packages/providers/UserDictionaryProvider" revision="d7eb9d4b59640175877a6f53f32b6e3e3d7154e9"/>
+  <project name="platform/packages/wallpapers/Basic" path="packages/wallpapers/Basic" revision="17db0721c8ef2d4f2c6835afaa3c47464730d9b1"/>
+  <project name="platform/packages/wallpapers/LivePicker" path="packages/wallpapers/LivePicker" revision="c114657db62c84b3b10c4e7d879d90ca5fc81d20"/>
+  <project name="platform/packages/wallpapers/MagicSmoke" path="packages/wallpapers/MagicSmoke" revision="4cb26a827ca03cad77522862cc78248e052ea0ca"/>
+  <project name="platform/packages/wallpapers/MusicVisualization" path="packages/wallpapers/MusicVisualization" revision="6759a52f863f60a67941938bd8d4610b01f9d2aa"/>
+  <project name="platform/prebuilt" path="prebuilt" revision="6b399f3609ac871310e9e51ff76393be605c6088"/>
+  <project name="platform/sdk" path="sdk" revision="dee444f860076b07d4b751fa64aba6683b4c377d"/>
+  <project name="platform/system/bluetooth" path="system/bluetooth" revision="7dc550597f490a67c8d020c727bfbf2d9d212d42"/>
+  <project name="platform/system/core" path="system/core" remote="linaro-android" revision="474bcaf1cbf12ff9007181a8093d2c12bc49d5b1"/>
+  <project name="platform/system/extras" path="system/extras" revision="8bdbbe2de23a8a8fc26b7f3a4b7dfdbe1112ac9f"/>
+  <project name="platform/system/media" path="system/media" remote="linaro-android" revision="bb5a707fe803083070c0d7ce475a0b898a522c22"/>
+  <project name="platform/system/netd" path="system/netd" revision="4415a6992691845c86bbb7b8ac9bd4c620338daa"/>
+  <project name="platform/system/vold" path="system/vold" remote="linaro-android" revision="119e194d52621f51892a0c7397f11637c0a5ec69"/>
+  <project name="x-loader/x-loader" path="device/linaro/x-loader" remote="gitorious" revision="c4289f1bee035dea41536c5ba5e1bc36c7d493c4"/>
 </manifest>
diff --git a/staging-iMX53.xml b/staging-iMX53.xml
index 4517b8ceb..cc54b6ee6 100644
--- a/staging-iMX53.xml
+++ b/staging-iMX53.xml
@@ -1,226 +1,191 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
-  <remote  name="korg"
-           fetch="git://android.git.linaro.org/"
-           review="review.android.git.linaro.org" />
-  <default revision="refs/tags/android-2.3.5_r1"
-           remote="korg" />
-
-  <remote  name="linaro-android"
-           fetch="git://android.git.linaro.org/"
-           review="review.android.git.linaro.org" />
-
-  <remote  name="linaro-other"
-           fetch="git://git.linaro.org/" />
-
-  <remote  name="0xbench"
-           fetch="git://gitorious.org/0xbench/" />
-
-  <remote  name="gitorious"
-           fetch="git://gitorious.org/" />
-
-  <remote  name="omapzoom"
-           fetch="git://git.omapzoom.org/repo/" />
-
-  <remote  name="freescale"
-           fetch="http://opensource.freescale.com/pub/scm/imx/" />
-
-  <!-- Linaro changes -->
-  <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_2.3.5" remote="linaro-android" />
-
-  <project path="device/linaro/iMX53" name="device/linaro/imx53" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="device/linaro/beagleboard" name="device/linaro/beagleboard" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="device/linaro/pandaboard" name="device/linaro/pandaboard" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="device/linaro/u8500href" name="device/linaro/u8500href" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="device/linaro/common" name="device/linaro/common" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="system/vold" name="platform/system/vold" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="system/core" name="platform/system/core" revision="linaro_android_2.3.5" remote="linaro-android" />
-
-  <project path="dalvik" name="platform/dalvik" revision="linaro_android_2.3.5" remote="linaro-android"/>
-  <project path="external/elfcopy" name="platform/external/elfcopy" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/skia" name="platform/external/skia" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="frameworks/opt/emoji" name="platform/frameworks/opt/emoji" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="libcore" name="platform/libcore" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="system/media" name="platform/system/media" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/svox" name="platform/external/svox" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/busybox" name="platform/external/busybox" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_2.3.5" remote="linaro-android" />
-
-  <project path="hardware/libhardware" name="platform/hardware/libhardware" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project name="people/kwerner/libunwind" path="external/libunwind" remote="linaro-other" revision="fc05b927bc13c00d38a540f603f4fcb4f7325846" />
-
-  <!-- Multimedia extensions -->
-  <project path="external/libvpx" name="platform/external/libvpx" revision="linaro-master" remote="linaro-android" />
-  <project path="external/x264" name="platform/external/x264" revision="linaro-master" remote="linaro-android" />
-  <project path="external/ffmpeg" name="platform/external/ffmpeg" revision="linaro-0.8" remote="linaro-android" />
-
-  <!-- Power WG -->
-  <project path="external/powertop" name="platform/external/powertop"  remote="linaro-android" revision="linaro" />
-  <project path="external/ncurses" name="platform/external/ncurses"  remote="linaro-android" revision="linaro" />
-  <project path="external/libnl" name="platform/external/libnl"  remote="linaro-android" revision="linaro" />
-  
-  <project path="build" name="platform/build" revision="linaro_android_2.3.5" remote="linaro-android" >
-    <copyfile src="core/root.mk" dest="Makefile" />
+  <remote fetch="git://gitorious.org/0xbench/" name="0xbench"/>
+  <remote fetch="http://opensource.freescale.com/pub/scm/imx/" name="freescale"/>
+  <remote fetch="git://gitorious.org/" name="gitorious"/>
+  <remote fetch="git://android.git.linaro.org/" name="korg" review="review.android.git.linaro.org"/>
+  <remote fetch="git://android.git.linaro.org/" name="linaro-android" review="review.android.git.linaro.org"/>
+  <remote fetch="git://git.linaro.org/" name="linaro-other"/>
+  <remote fetch="git://git.omapzoom.org/repo/" name="omapzoom"/>
+
+  <default remote="korg" revision="refs/tags/android-2.3.5_r1"/>
+
+  <project name="0xbench" path="packages/apps/0xbench" remote="0xbench" revision="1772a907e73e188317c60d5d9561551e5d9b6c5f"/>
+  <project name="boot/u-boot-linaro-stable" path="u-boot" remote="linaro-other" revision="de7b464fe0a2f841db43556df422409c577830fb"/>
+  <project name="device/common" revision="3b932551eb896cd1880e65b156059a5f34d2f655"/>
+  <project name="device/google/accessory/arduino" revision="ee3bb7c351e732e8f518cde0238bf9b3d810d80a"/>
+  <project name="device/google/accessory/demokit" revision="37921cd911a238cee5d79c6f63f84304c1ca36e0"/>
+  <project name="device/linaro/beagleboard" remote="linaro-android" revision="5029d2ca236dd840e9b2785ff4daeb7c9b627995"/>
+  <project name="device/linaro/common" remote="linaro-android" revision="1550de16d8bf3e80b333b73ee1dec7750fe552f8"/>
+  <project name="device/linaro/imx53" path="device/linaro/iMX53" remote="linaro-android" revision="9050470530fae8d52e6b326bbadf3a2b86d212bb"/>
+  <project name="device/linaro/pandaboard" remote="linaro-android" revision="5dac14677e208091d28f540a38e98f8152e93b58"/>
+  <project name="device/linaro/u8500href" remote="linaro-android" revision="b316efeb3147ee8e236db39192671595570b783b"/>
+  <project name="device/sample" revision="e04c7b12e187584785a038e586b8aeccc82b33d0"/>
+  <project name="device/samsung/crespo" revision="6a740e418e0a2a9beddc4f31ee6607e90d420b17"/>
+  <project name="people/afrantzis/glmark2" path="packages/apps/glmark2" remote="linaro-other" revision="e3727c42da8cf7dd554df5d25c6ee249bad0a452"/>
+  <project name="people/bernhardrosenkranzer/android-kernel-iMX53" path="kernel" remote="linaro-other" revision="5500ccef0d11c598629295769fdbe07609d82990"/>
+  <project name="people/kwerner/libunwind" path="external/libunwind" remote="linaro-other" revision="fc05b927bc13c00d38a540f603f4fcb4f7325846"/>
+  <project name="people/tomgall/libjpeg-turbo/libjpeg-turbo" path="external/jpeg" remote="linaro-other" revision="0206f26bd4229243a87b3519d251f9e4947b6b2a"/>
+  <project name="platform/bionic" path="bionic" remote="linaro-android" revision="46e1d893c41c20e3d348fb64414b8294a3eebcb2"/>
+  <project name="platform/bootable/bootloader/legacy" path="bootable/bootloader/legacy" revision="d3271024770ddcc2fb87dd22f8280764545ab05a"/>
+  <project name="platform/bootable/diskinstaller" path="bootable/diskinstaller" revision="53bd9111b5ae1fc1180ec13755d9830f7cadacf5"/>
+  <project name="platform/bootable/recovery" path="bootable/recovery" revision="7172eb7b623f4b30f5a709d639fcd3fb51cd6220"/>
+  <project name="platform/build" path="build" remote="linaro-android" revision="edec05c8c7186bea4befcf95054548db3a0143f9">
+    <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-
-  <!--project path="kernel" name="bsp/freescale/linux-linaro-android" revision="lt-android-38" remote="linaro-other" / -->
-  <!-- The kernel below is a clone of the above with a compile fix -->
-  <project path="kernel" name="people/bernhardrosenkranzer/android-kernel-iMX53" revision="linaro-android-11.07" remote="linaro-other"/>
-  <project path="u-boot" name="boot/u-boot-linaro-stable" revision="master" remote="linaro-other" />
-  <!-- project path="u-boot" name="uboot-imx.git" revision="master" remote="freescale" / -->
-
-  <project path="packages/apps/0xbench" name="0xbench" revision="master" remote="0xbench" />
-  <project path="packages/apps/mmtest" name="platform/packages/apps/mmtest" revision="master" remote="linaro-android" />
-  <project path="packages/apps/glmark2" name="people/afrantzis/glmark2" revision="master" remote="linaro-other" />
-
-  <project path="external/jpeg" name="people/tomgall/libjpeg-turbo/libjpeg-turbo" revision="1.2-beta-linaro-andoid" remote="linaro-other" />
-  <project path="external/dbus" name="platform/external/dbus" revision="linaro-master" remote="linaro-android" />
-  <project path="bionic" name="platform/bionic" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/fdlibm" name="platform/external/fdlibm" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/icu4c" name="platform/external/icu4c" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/iptables" name="platform/external/iptables" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_2.3.5" remote="linaro-android" />
-
-  <!-- x-loader -->
-  <project path="device/linaro/x-loader" name="x-loader/x-loader" revision="master" remote="gitorious" />
-
-  <!-- standard Andorid manifest -->
-  <project path="bootable/bootloader/legacy" name="platform/bootable/bootloader/legacy" />
-  <project path="bootable/diskinstaller" name="platform/bootable/diskinstaller" />
-  <project path="bootable/recovery" name="platform/bootable/recovery" />
-  <project path="cts" name="platform/cts" />
-  <project path="development" name="platform/development" />
-  <project path="device/common" name="device/common" />
-  <project path="device/google/accessory/arduino" name="device/google/accessory/arduino" />
-  <project path="device/google/accessory/demokit" name="device/google/accessory/demokit" />
-  <project path="device/sample" name="device/sample" />
-  <project path="device/samsung/crespo" name="device/samsung/crespo" />
-  <project path="external/apache-http" name="platform/external/apache-http" />
-  <project path="external/astl" name="platform/external/astl" />
-  <project path="external/bison" name="platform/external/bison" />
-  <project path="external/blktrace" name="platform/external/blktrace" />
-  <project path="external/bluetooth/bluez" name="platform/external/bluetooth/bluez" />
-  <project path="external/bluetooth/glib" name="platform/external/bluetooth/glib" />
-  <project path="external/bluetooth/hcidump" name="platform/external/bluetooth/hcidump" />
-  <project path="external/bouncycastle" name="platform/external/bouncycastle" />
-  <project path="external/bsdiff" name="platform/external/bsdiff" />
-  <project path="external/bzip2" name="platform/external/bzip2" />
-  <project path="external/chromium" name="platform/external/chromium" />
-  <project path="external/clearsilver" name="platform/external/clearsilver" />
-  <project path="external/dhcpcd" name="platform/external/dhcpcd" />
-  <project path="external/dropbear" name="platform/external/dropbear" />
-  <project path="external/e2fsprogs" name="platform/external/e2fsprogs" />
-  <project path="external/easymock" name="platform/external/easymock" />
-  <project path="external/elfutils" name="platform/external/elfutils" />
-  <project path="external/embunit" name="platform/external/embunit" />
-  <project path="external/emma" name="platform/external/emma" />
-  <project path="external/esd" name="platform/external/esd" />
-  <project path="external/expat" name="platform/external/expat" />
-  <project path="external/freetype" name="platform/external/freetype" />
-  <project path="external/fsck_msdos" name="platform/external/fsck_msdos" />
-  <project path="external/genext2fs" name="platform/external/genext2fs" />
-  <project path="external/giflib" name="platform/external/giflib" />
-  <project path="external/grub" name="platform/external/grub" />
-  <project path="external/gtest" name="platform/external/gtest" />
-  <project path="external/guava" name="platform/external/guava" />
-  <project path="external/iproute2" name="platform/external/iproute2" />
-  <project path="external/ipsec-tools" name="platform/external/ipsec-tools" />
-  <project path="external/jdiff" name="platform/external/jdiff" />
-  <project path="external/jhead" name="platform/external/jhead" />
-  <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/libgsm" name="platform/external/libgsm" />
-  <project path="external/libnfc-nxp" name="platform/external/libnfc-nxp" />
-  <project path="external/libpcap" name="platform/external/libpcap" />
-  <project path="external/libpng" name="platform/external/libpng" />
-  <project path="external/libxml2" name="platform/external/libxml2" />
-  <project path="external/mtpd" name="platform/external/mtpd" />
-  <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/nist-sip" name="platform/external/nist-sip" />
-  <project path="external/oauth" name="platform/external/oauth" />
-  <project path="external/openssl" name="platform/external/openssl" />
-  <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/protobuf" name="platform/external/protobuf" />
-  <project path="external/qemu" name="platform/external/qemu" />
-  <project path="external/quake" name="platform/external/quake" />
-  <project path="external/safe-iop" name="platform/external/safe-iop" />
-  <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/strace" name="platform/external/strace" />
-  <project path="external/tagsoup" name="platform/external/tagsoup" />
-  <project path="external/tinyxml" name="platform/external/tinyxml" />
-  <project path="external/tremolo" name="platform/external/tremolo" />
-  <project path="external/v8" name="platform/external/v8" />
-  <project path="external/wpa_supplicant" name="platform/external/wpa_supplicant" />
-  <project path="external/wpa_supplicant_6" name="platform/external/wpa_supplicant_6" />
-  <project path="external/xmlwriter" name="platform/external/xmlwriter" />
-  <project path="external/yaffs2" name="platform/external/yaffs2" />
-  <project path="external/zlib" name="platform/external/zlib" />
-  <project path="frameworks/ex" name="platform/frameworks/ex" />
-  <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" />
-  <project path="hardware/ril" name="platform/hardware/ril" />
-  <project path="ndk" name="platform/ndk" />
-  <project path="packages/apps/AccountsAndSyncSettings" name="platform/packages/apps/AccountsAndSyncSettings" />
-  <project path="packages/apps/Bluetooth" name="platform/packages/apps/Bluetooth" />
-  <project path="packages/apps/Browser" name="platform/packages/apps/Browser" />
-  <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="platform/packages/apps/Camera" />
-  <project path="packages/apps/CellBroadcastReceiver" name="platform/packages/apps/CellBroadcastReceiver" />
-  <project path="packages/apps/CertInstaller" name="platform/packages/apps/CertInstaller" />
-  <project path="packages/apps/Contacts" name="platform/packages/apps/Contacts" />
-  <project path="packages/apps/DeskClock" name="platform/packages/apps/DeskClock" />
-  <project path="packages/apps/Email" name="platform/packages/apps/Email" />
-  <project path="packages/apps/Gallery" name="platform/packages/apps/Gallery" />
-  <project path="packages/apps/Gallery3D" name="platform/packages/apps/Gallery3D" />
-  <project path="packages/apps/HTMLViewer" name="platform/packages/apps/HTMLViewer" />
-  <project path="packages/apps/Launcher2" name="platform/packages/apps/Launcher2" />
-  <project path="packages/apps/Mms" name="platform/packages/apps/Mms" />
-  <project path="packages/apps/Music" name="platform/packages/apps/Music" />
-  <project path="packages/apps/Nfc" name="platform/packages/apps/Nfc" />
-  <project path="packages/apps/PackageInstaller" name="platform/packages/apps/PackageInstaller" />
-  <project path="packages/apps/Phone" name="platform/packages/apps/Phone" />
-  <project path="packages/apps/Protips" name="platform/packages/apps/Protips" />
-  <project path="packages/apps/QuickSearchBox" name="platform/packages/apps/QuickSearchBox" />
-  <project path="packages/apps/SmartCardService" name="platform/packages/apps/SmartCardService" />
-  <project path="packages/apps/SoundRecorder" name="platform/packages/apps/SoundRecorder" />
-  <project path="packages/apps/SpeechRecorder" name="platform/packages/apps/SpeechRecorder" />
-  <project path="packages/apps/Stk" name="platform/packages/apps/Stk" />
-  <project path="packages/apps/Tag" name="platform/packages/apps/Tag" />
-  <project path="packages/apps/VoiceDialer" name="platform/packages/apps/VoiceDialer" />
-  <project path="packages/experimental" name="platform/packages/experimental" />
-  <project path="packages/inputmethods/LatinIME" name="platform/packages/inputmethods/LatinIME" />
-  <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="platform/packages/providers/DownloadProvider" />
-  <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="platform/packages/providers/MediaProvider" />
-  <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="platform/packages/wallpapers/Basic" />
-  <project path="packages/wallpapers/LivePicker" name="platform/packages/wallpapers/LivePicker" />
-  <project path="packages/wallpapers/MagicSmoke" name="platform/packages/wallpapers/MagicSmoke" />
-  <project path="packages/wallpapers/MusicVisualization" name="platform/packages/wallpapers/MusicVisualization" />
-  <project path="prebuilt" name="platform/prebuilt" />
-  <project path="sdk" name="platform/sdk" />
-  <project path="system/bluetooth" name="platform/system/bluetooth" />
-  <project path="system/extras" name="platform/system/extras" />
-  <project path="system/netd" name="platform/system/netd" />
-
+  <project name="platform/cts" path="cts" revision="6b4d831147bd65bc5a3d3e23c05626c831151615"/>
+  <project name="platform/dalvik" path="dalvik" remote="linaro-android" revision="87dc8dd69f81bb07007969dee9e71bce7fa82807"/>
+  <project name="platform/development" path="development" revision="f60f95391262f2295b9173e23a9344c8322d604a"/>
+  <project name="platform/external/apache-http" path="external/apache-http" revision="b91c5e936342afbdd58c88ac604d5dd505d0fe0c"/>
+  <project name="platform/external/astl" path="external/astl" revision="c3c760978c34d5eeea1205c0bf7f27444e192a98"/>
+  <project name="platform/external/bison" path="external/bison" revision="889df9c1efa7ca5de113407ab7793b57a6db677d"/>
+  <project name="platform/external/blktrace" path="external/blktrace" revision="ac4461c3b3e7bcbafe5336b9478657d0fa3e08aa"/>
+  <project name="platform/external/bluetooth/bluez" path="external/bluetooth/bluez" revision="02e98694ef87ea8ecb47789abf89c3f945ee0e20"/>
+  <project name="platform/external/bluetooth/glib" path="external/bluetooth/glib" revision="0c01eb3a7313a580fe34044bcdc3337d067c8a15"/>
+  <project name="platform/external/bluetooth/hcidump" path="external/bluetooth/hcidump" revision="ce36a6c7c5f8043c038415d8e270d55d9834008d"/>
+  <project name="platform/external/bouncycastle" path="external/bouncycastle" revision="3ab12958718f17e48e2816a84d403f6305cc2800"/>
+  <project name="platform/external/bsdiff" path="external/bsdiff" revision="df980d633fd0bdc0b89af26630f543d91bb87e68"/>
+  <project name="platform/external/busybox" path="external/busybox" remote="linaro-android" revision="496c5fca645e6b724b162e66931e446a85fc49d3"/>
+  <project name="platform/external/bzip2" path="external/bzip2" revision="879585bbef51b4cabaac6340a95d807dca379cdc"/>
+  <project name="platform/external/chromium" path="external/chromium" revision="5e43ad9465e402d595a3c960784b1effe2e9bd88"/>
+  <project name="platform/external/clearsilver" path="external/clearsilver" revision="3e15867df7fb41770c090ee40411a6c376574ae3"/>
+  <project name="platform/external/dbus" path="external/dbus" remote="linaro-android" revision="97b3dae199a09f003fd60fe63f1b17ec0fa5fb76"/>
+  <project name="platform/external/dhcpcd" path="external/dhcpcd" revision="17fdc0dee1db0246a59cd3b28278389043fe5134"/>
+  <project name="platform/external/dnsmasq" path="external/dnsmasq" remote="linaro-android" revision="ebf5da42ba598621e9dbb878196254e83c91d8fc"/>
+  <project name="platform/external/dropbear" path="external/dropbear" revision="d3a3a803df8f32e9ba26758b3a9d7fbd27a3dc9c"/>
+  <project name="platform/external/e2fsprogs" path="external/e2fsprogs" revision="6641b4da8001b46fd17e723a572459db0325e023"/>
+  <project name="platform/external/easymock" path="external/easymock" revision="17d5eb4006c438775d8eaa7600e947e4ac090a18"/>
+  <project name="platform/external/elfcopy" path="external/elfcopy" remote="linaro-android" revision="0513f4c3119ad2ca0b302eedefc58cc7f470d6de"/>
+  <project name="platform/external/elfutils" path="external/elfutils" revision="84cf4183ba6f577ee01abe7f1f5a6d4b23df35a8"/>
+  <project name="platform/external/embunit" path="external/embunit" revision="f5eb8b0c9abf1e9911b5c84a555bc495651595e5"/>
+  <project name="platform/external/emma" path="external/emma" revision="4d37e21b7c2fa378dbf7cfe2ea57d7f5991fe6cd"/>
+  <project name="platform/external/esd" path="external/esd" revision="224a67f2683a7ee997179fc5dd16115e39987b0f"/>
+  <project name="platform/external/expat" path="external/expat" revision="204e2ef0e1a2c2da0087cccb0c9b618d52f1d584"/>
+  <project name="platform/external/fdlibm" path="external/fdlibm" remote="linaro-android" revision="a74d3139b5e2046e52a94f6b1510d5e3d15c2bc1"/>
+  <project name="platform/external/ffmpeg" path="external/ffmpeg" remote="linaro-android" revision="6d020211c1fb464b956c203e6cc5a0e157d1eb13"/>
+  <project name="platform/external/freetype" path="external/freetype" revision="aacb8e1368a883fcbc9fe64fd0e460cef9c9b20c"/>
+  <project name="platform/external/fsck_msdos" path="external/fsck_msdos" revision="b6ee08aadb580341a4d80943741b80de16a88b5d"/>
+  <project name="platform/external/genext2fs" path="external/genext2fs" revision="28f10892a39db10b1c65125723d9737de865ef56"/>
+  <project name="platform/external/giflib" path="external/giflib" revision="b2597268aef084202a8c349d1cc072c03c6e22eb"/>
+  <project name="platform/external/grub" path="external/grub" revision="a0be411871f2e71834a2cd75dea882d732557530"/>
+  <project name="platform/external/gtest" path="external/gtest" revision="75f109c3120bf78ee89124f1f21b50ea24225236"/>
+  <project name="platform/external/guava" path="external/guava" revision="5fa17bce47c47d5538beaaef0e38f0576446709c"/>
+  <project name="platform/external/icu4c" path="external/icu4c" remote="linaro-android" revision="0fd910cf8e8f3681d7a727f09273ce76dbfe4ec9"/>
+  <project name="platform/external/iproute2" path="external/iproute2" revision="14740a4557728ba63348e0574507a71fa40a8bd4"/>
+  <project name="platform/external/ipsec-tools" path="external/ipsec-tools" revision="f5d0d0919f6c0b82611c1f8ad0cb6023a78b6ce0"/>
+  <project name="platform/external/iptables" path="external/iptables" remote="linaro-android" revision="4ebfa4c82fc82e25e1206a9197809062d5d4f306"/>
+  <project name="platform/external/jdiff" path="external/jdiff" revision="590cef7c1b48c9c3f4556ae65fbc0065d65da54a"/>
+  <project name="platform/external/jhead" path="external/jhead" revision="fd983181d9043cdf45497ace19c60fd9e4e1799c"/>
+  <project name="platform/external/jsr305" path="external/jsr305" revision="8e937939899d5fe3a6864c7ecb9bb8632678a7c7"/>
+  <project name="platform/external/junit" path="external/junit" revision="e9b8080d6d80d17729e0b7f8b1d2b573b3456cc4"/>
+  <project name="platform/external/kernel-headers" path="external/kernel-headers" revision="8abdcd4098f266e438e7129a3dfe311005686431"/>
+  <project name="platform/external/libffi" path="external/libffi" revision="5dea54fd57265ce037ac94055b9f94a45558b39e"/>
+  <project name="platform/external/libgsm" path="external/libgsm" revision="5e4516958690b9a1b2c98f88eeecba3edd2dbda4"/>
+  <project name="platform/external/libnfc-nxp" path="external/libnfc-nxp" revision="178bcc31188d60d13e7455c14e9fd902f5505331"/>
+  <project name="platform/external/libnl" path="external/libnl" remote="linaro-android" revision="bbcb553f0f4636dd40e84d320a576b3de7b95357"/>
+  <project name="platform/external/libpcap" path="external/libpcap" revision="3a7bce5dda6a8db92c9248846d0255e68c3a5b2a"/>
+  <project name="platform/external/libpng" path="external/libpng" revision="4ce0ee15f268e0161438b4133936cb2826f7fd50"/>
+  <project name="platform/external/libvpx" path="external/libvpx" remote="linaro-android" revision="62644e5902d0ea9de45ed57442587020a21115e7"/>
+  <project name="platform/external/libxml2" path="external/libxml2" revision="f16b5fdc2102953f6b915472200061e17e76702b"/>
+  <project name="platform/external/mtpd" path="external/mtpd" revision="fccbc17685cd8bd43cf1c1e533c4d02f6f79d667"/>
+  <project name="platform/external/ncurses" path="external/ncurses" remote="linaro-android" revision="5fc466743430377a29b0dc6a38b0d1de843581e7"/>
+  <project name="platform/external/netcat" path="external/netcat" revision="fc2dc55c510657073ef4235658167a878e82cefa"/>
+  <project name="platform/external/netperf" path="external/netperf" revision="58ecd3b7c76263900e38921360e334a416aec362"/>
+  <project name="platform/external/neven" path="external/neven" revision="7164d6ac08ab9fc1247aa29f1dafd0ef7808f0f2"/>
+  <project name="platform/external/nist-sip" path="external/nist-sip" revision="a58e4068f86c6ca3f9771d4ec8b2665d070a170e"/>
+  <project name="platform/external/oauth" path="external/oauth" revision="c76276a1d6165cfb502b06f65b1735fef0754d26"/>
+  <project name="platform/external/openssl" path="external/openssl" revision="f07bf9fa6a96c0039e832242569c8e6fc40c9a94"/>
+  <project name="platform/external/oprofile" path="external/oprofile" revision="041ee6ccda354960ebc1e1ccfff78685ec5326e1"/>
+  <project name="platform/external/ping" path="external/ping" revision="f35ea57ab6d01badde92491274ff2d74cbe3cf01"/>
+  <project name="platform/external/powertop" path="external/powertop" remote="linaro-android" revision="3d1c205aabb9a0451c6b3fe7846e8cce5521c727"/>
+  <project name="platform/external/ppp" path="external/ppp" revision="d88bff8f5384285f76576eb7707c6d9d5b98edb6"/>
+  <project name="platform/external/proguard" path="external/proguard" revision="6660cb6cb4231a03a3c02127fa5c4e7828422caa"/>
+  <project name="platform/external/protobuf" path="external/protobuf" revision="3574de1ca8301e1e13d1c89f2e2a902499d6bae9"/>
+  <project name="platform/external/qemu" path="external/qemu" revision="2fa5173bd1ce7341c50adac676a317945f0969c7"/>
+  <project name="platform/external/quake" path="external/quake" revision="9b0abf864353d47404417c1cbd8384e15be547b0"/>
+  <project name="platform/external/safe-iop" path="external/safe-iop" revision="07073634e2e3aa4f518e36ed5dec3aabc549d5fb"/>
+  <project name="platform/external/skia" path="external/skia" remote="linaro-android" revision="b17b930777b5c84e9a8048147577646a58a6a0fc"/>
+  <project name="platform/external/sonivox" path="external/sonivox" revision="d029b2378170cfd7bb34d894482065a762a54578"/>
+  <project name="platform/external/speex" path="external/speex" revision="32e4d0aa78c5879565cbcd06415fa2e344036ab5"/>
+  <project name="platform/external/sqlite" path="external/sqlite" revision="90f23688416d9f4e1e5d0128dca5f26404b6898e"/>
+  <project name="platform/external/srec" path="external/srec" revision="7390035ea61b32477243d60c452664150b61f023"/>
+  <project name="platform/external/stlport" path="external/stlport" remote="linaro-android" revision="f56d1f0242e7eb2800f552e3c3c562b02c26b2b2"/>
+  <project name="platform/external/strace" path="external/strace" revision="cfa96b379cdd6561a5cc89f2bb86ee9f4b2a3928"/>
+  <project name="platform/external/svox" path="external/svox" remote="linaro-android" revision="c54cda009637d7be08e4cd5b829ec0fc3079f60f"/>
+  <project name="platform/external/tagsoup" path="external/tagsoup" revision="68c2ec9e0acdb3214b7fb91dbab8c9fab8736817"/>
+  <project name="platform/external/tcpdump" path="external/tcpdump" remote="linaro-android" revision="616015d52648c7eb6460eb6411aa87581cbb0e13"/>
+  <project name="platform/external/tinyxml" path="external/tinyxml" revision="d589f7e4a51e75bd5c98a3defd8ee84d7059e86e"/>
+  <project name="platform/external/tremolo" path="external/tremolo" revision="9a688754461ebfc91769b5d3c8ba5aba9fe1f376"/>
+  <project name="platform/external/v8" path="external/v8" revision="6599b9dd3411791c9d89ab7efbfb4131e5664c48"/>
+  <project name="platform/external/webkit" path="external/webkit" remote="linaro-android" revision="1e02484fcaef9e1ea900b6e3323b8907c79b4bb2"/>
+  <project name="platform/external/wpa_supplicant" path="external/wpa_supplicant" revision="2b7ee495307e9fd349a0f37ec560834adbc954cc"/>
+  <project name="platform/external/wpa_supplicant_6" path="external/wpa_supplicant_6" revision="b2522a100c9c6688508261b04e83fa1d0bdc88ab"/>
+  <project name="platform/external/x264" path="external/x264" remote="linaro-android" revision="c8be2223e23a49c852557881d8210a70aae9cb5c"/>
+  <project name="platform/external/xmlwriter" path="external/xmlwriter" revision="e95d92246ee35273dde2bee8b00485cc14c12be5"/>
+  <project name="platform/external/yaffs2" path="external/yaffs2" revision="0fe811d9a994dd6df8aa9852c7b9241fa9aa453b"/>
+  <project name="platform/external/zlib" path="external/zlib" revision="96c70b1df1629d7f0eb8f666045bfd5eb062cebf"/>
+  <project name="platform/frameworks/base" path="frameworks/base" remote="linaro-android" revision="a08dc19c13967d6efa54443c21918288d5fb4178"/>
+  <project name="platform/frameworks/ex" path="frameworks/ex" revision="e0d5045a56146f0e7d8ea9e400f6eb209edceec5"/>
+  <project name="platform/frameworks/opt/emoji" path="frameworks/opt/emoji" remote="linaro-android" revision="941fb3d38928a8483701fe2be45ccbc6579f3633"/>
+  <project name="platform/hardware/libhardware" path="hardware/libhardware" remote="linaro-android" revision="f50b075a8b88eff482628e8ab62a04539117c7ea"/>
+  <project name="platform/hardware/libhardware_legacy" path="hardware/libhardware_legacy" revision="17f1ff8c99dada2cca93f68d434cf64a6dc692c2"/>
+  <project name="platform/hardware/ril" path="hardware/ril" revision="3b1530aef62476248825a2092c9aea800395c3b1"/>
+  <project name="platform/libcore" path="libcore" remote="linaro-android" revision="b390cef44c168f9a6cfa8b70cc7861869ab3be5d"/>
+  <project name="platform/ndk" path="ndk" revision="7a619be40e8594a961066a33b7cc9ef52f566988"/>
+  <project name="platform/packages/apps/AccountsAndSyncSettings" path="packages/apps/AccountsAndSyncSettings" revision="0179779e69d0a8ce2879cf27261af9bc2908cae0"/>
+  <project name="platform/packages/apps/Bluetooth" path="packages/apps/Bluetooth" revision="6d48feaaff63b14adc23e7b2d82854189a456f15"/>
+  <project name="platform/packages/apps/Browser" path="packages/apps/Browser" revision="7b6955578d914557eea7ff3cbcec70e953970092"/>
+  <project name="platform/packages/apps/Calculator" path="packages/apps/Calculator" revision="5c85e48a713ec70ebce65ebf1a3622035992f8c3"/>
+  <project name="platform/packages/apps/Calendar" path="packages/apps/Calendar" revision="ee794988e54a2e8172b1482d108924934c0f70cb"/>
+  <project name="platform/packages/apps/Camera" path="packages/apps/Camera" revision="8ff2adc739ca898d0230c702eed7d327e5bbf4dc"/>
+  <project name="platform/packages/apps/CellBroadcastReceiver" path="packages/apps/CellBroadcastReceiver" revision="50a624a47ce645a7992e346e40a4e7ec5e0df9b7"/>
+  <project name="platform/packages/apps/CertInstaller" path="packages/apps/CertInstaller" revision="457ffda6726b8e0f88d78a9267b840d102a8907a"/>
+  <project name="platform/packages/apps/Contacts" path="packages/apps/Contacts" revision="ec0e540fb20a31f77ca561bc4a872e817195627a"/>
+  <project name="platform/packages/apps/DeskClock" path="packages/apps/DeskClock" revision="8e1921f8140f205c115582e4a068c7ba5e79ff9c"/>
+  <project name="platform/packages/apps/Email" path="packages/apps/Email" revision="8c23a70b9123b77511e3ed9bbe827fe0c26bb674"/>
+  <project name="platform/packages/apps/Gallery" path="packages/apps/Gallery" revision="ea32625b6296585a0328886c33159d88e3a2c693"/>
+  <project name="platform/packages/apps/Gallery3D" path="packages/apps/Gallery3D" revision="87a545419820bc665d8fdb13845b65cf9707a7d8"/>
+  <project name="platform/packages/apps/HTMLViewer" path="packages/apps/HTMLViewer" revision="f470146b74d34c21e4d3526574e2bbd0e72a57f0"/>
+  <project name="platform/packages/apps/Launcher2" path="packages/apps/Launcher2" revision="3fd010a6fe457a59d2e983a348e63dc25e836852"/>
+  <project name="platform/packages/apps/Mms" path="packages/apps/Mms" revision="fd1766e6613390ac9d7c0dd8feac8708fa023a2b"/>
+  <project name="platform/packages/apps/Music" path="packages/apps/Music" revision="278aaed1eb37763f7dcb2364523db591014a9210"/>
+  <project name="platform/packages/apps/Nfc" path="packages/apps/Nfc" revision="e4d9ddebb676325c6abfe3b0d4c0aefa8a17d952"/>
+  <project name="platform/packages/apps/PackageInstaller" path="packages/apps/PackageInstaller" revision="6d2974c3f346511f96eba3370398123422e578fc"/>
+  <project name="platform/packages/apps/Phone" path="packages/apps/Phone" revision="54c42aebae50804cb620a35f0f82dd2ce2187e53"/>
+  <project name="platform/packages/apps/Protips" path="packages/apps/Protips" revision="a853d2b914144dd1f2ff3f03170f67d74338815d"/>
+  <project name="platform/packages/apps/QuickSearchBox" path="packages/apps/QuickSearchBox" revision="e8b28b6f1cab74060ea3101b1eee1dfdb32c89e9"/>
+  <project name="platform/packages/apps/Settings" path="packages/apps/Settings" remote="linaro-android" revision="ee25812a8eda802cc144dc416f2dca88d421bcef"/>
+  <project name="platform/packages/apps/SmartCardService" path="packages/apps/SmartCardService" revision="29eae320a4bd222b5ff1c092f84f1aebba88d0b7"/>
+  <project name="platform/packages/apps/SoundRecorder" path="packages/apps/SoundRecorder" revision="20b07a73ec046d23f5cfabaf60d54feb868a5eea"/>
+  <project name="platform/packages/apps/SpeechRecorder" path="packages/apps/SpeechRecorder" revision="f075eb5cefb6357aa7562a6d156bda5383ac087d"/>
+  <project name="platform/packages/apps/Stk" path="packages/apps/Stk" revision="d2f267c7ed48dc77878299e12925bc3c39db5d37"/>
+  <project name="platform/packages/apps/Tag" path="packages/apps/Tag" revision="4b1e01421a564b348fcf7c0203dcb89576883aff"/>
+  <project name="platform/packages/apps/VoiceDialer" path="packages/apps/VoiceDialer" revision="13b6acf2174e8dc23f70def279c85d191c3fcbc1"/>
+  <project name="platform/packages/apps/mmtest" path="packages/apps/mmtest" remote="linaro-android" revision="7caaadf7a48c0322693f226d7a78b78f853d51c0"/>
+  <project name="platform/packages/experimental" path="packages/experimental" revision="504fe3ddddf722e4315b382319970b0e435af27b"/>
+  <project name="platform/packages/inputmethods/LatinIME" path="packages/inputmethods/LatinIME" revision="ec622ced359cfe646efc14b68e25539fa7a438d9"/>
+  <project name="platform/packages/inputmethods/OpenWnn" path="packages/inputmethods/OpenWnn" revision="27ab9d1b806f03554d2abb50de26abe7bf234336"/>
+  <project name="platform/packages/inputmethods/PinyinIME" path="packages/inputmethods/PinyinIME" revision="6b7954e2967754a77c55dc4291941978e3508259"/>
+  <project name="platform/packages/providers/ApplicationsProvider" path="packages/providers/ApplicationsProvider" revision="0234d298ecdffe3a10877d6edffe98e299713caa"/>
+  <project name="platform/packages/providers/CalendarProvider" path="packages/providers/CalendarProvider" revision="959739d351af5d04e8c92f6b031f737348d4b139"/>
+  <project name="platform/packages/providers/ContactsProvider" path="packages/providers/ContactsProvider" revision="c9d8e21bd1e6dbde3208b9475a2697081f8ced79"/>
+  <project name="platform/packages/providers/DownloadProvider" path="packages/providers/DownloadProvider" revision="abb94fb35445de2eadd1804ad2f4023bd50a6b5c"/>
+  <project name="platform/packages/providers/DrmProvider" path="packages/providers/DrmProvider" revision="42f3f2cbfecbbca1d18a5ff91e12619eba740516"/>
+  <project name="platform/packages/providers/GoogleContactsProvider" path="packages/providers/GoogleContactsProvider" revision="4886c7a0cfba5df74b213b1fc8286c6e3f2ddaa2"/>
+  <project name="platform/packages/providers/MediaProvider" path="packages/providers/MediaProvider" revision="2b0e56b7595da308d61d190b529518cdefc98acd"/>
+  <project name="platform/packages/providers/TelephonyProvider" path="packages/providers/TelephonyProvider" revision="6a5c080b90613c5afef04d453ab1498d22aee0a9"/>
+  <project name="platform/packages/providers/UserDictionaryProvider" path="packages/providers/UserDictionaryProvider" revision="d7eb9d4b59640175877a6f53f32b6e3e3d7154e9"/>
+  <project name="platform/packages/wallpapers/Basic" path="packages/wallpapers/Basic" revision="17db0721c8ef2d4f2c6835afaa3c47464730d9b1"/>
+  <project name="platform/packages/wallpapers/LivePicker" path="packages/wallpapers/LivePicker" revision="c114657db62c84b3b10c4e7d879d90ca5fc81d20"/>
+  <project name="platform/packages/wallpapers/MagicSmoke" path="packages/wallpapers/MagicSmoke" revision="4cb26a827ca03cad77522862cc78248e052ea0ca"/>
+  <project name="platform/packages/wallpapers/MusicVisualization" path="packages/wallpapers/MusicVisualization" revision="6759a52f863f60a67941938bd8d4610b01f9d2aa"/>
+  <project name="platform/prebuilt" path="prebuilt" revision="6b399f3609ac871310e9e51ff76393be605c6088"/>
+  <project name="platform/sdk" path="sdk" revision="dee444f860076b07d4b751fa64aba6683b4c377d"/>
+  <project name="platform/system/bluetooth" path="system/bluetooth" revision="7dc550597f490a67c8d020c727bfbf2d9d212d42"/>
+  <project name="platform/system/core" path="system/core" remote="linaro-android" revision="474bcaf1cbf12ff9007181a8093d2c12bc49d5b1"/>
+  <project name="platform/system/extras" path="system/extras" revision="8bdbbe2de23a8a8fc26b7f3a4b7dfdbe1112ac9f"/>
+  <project name="platform/system/media" path="system/media" remote="linaro-android" revision="bb5a707fe803083070c0d7ce475a0b898a522c22"/>
+  <project name="platform/system/netd" path="system/netd" revision="4415a6992691845c86bbb7b8ac9bd4c620338daa"/>
+  <project name="platform/system/vold" path="system/vold" remote="linaro-android" revision="119e194d52621f51892a0c7397f11637c0a5ec69"/>
+  <project name="x-loader/x-loader" path="device/linaro/x-loader" remote="gitorious" revision="c4289f1bee035dea41536c5ba5e1bc36c7d493c4"/>
 </manifest>
diff --git a/staging-omap4460.xml b/staging-omap4460.xml
deleted file mode 100644
index fb81ac016..000000000
--- a/staging-omap4460.xml
+++ /dev/null
@@ -1,221 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<manifest>
-  <remote  name="korg"
-           fetch="git://android.git.linaro.org/"
-           review="review.android.git.linaro.org" />
-  <default revision="refs/tags/android-2.3.5_r1"
-           remote="korg" />
-
-  <remote  name="linaro-android"
-           fetch="git://android.git.linaro.org/"
-           review="review.android.git.linaro.org" />
-
-  <remote  name="linaro-other"
-           fetch="git://git.linaro.org/" />
-
-  <remote  name="0xbench"
-           fetch="git://gitorious.org/0xbench/" />
-
-  <remote  name="gitorious"
-           fetch="git://gitorious.org/" />
-
-  <remote  name="omapzoom"
-           fetch="git://git.omapzoom.org/repo/" />
-
-
-  <!-- Linaro changes -->
-  <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_2.3.5" remote="linaro-android" />
-
-  <project path="device/linaro/beagleboard" name="device/linaro/beagleboard" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="device/linaro/pandaboard" name="device/linaro/pandaboard" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="device/linaro/u8500href" name="device/linaro/u8500href" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="device/linaro/common" name="device/linaro/common" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="system/vold" name="platform/system/vold" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="system/core" name="platform/system/core" revision="linaro_android_2.3.5" remote="linaro-android" />
-
-  <project path="dalvik" name="platform/dalvik" revision="linaro_android_2.3.5" remote="linaro-android"/>
-  <project path="external/elfcopy" name="platform/external/elfcopy" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/skia" name="platform/external/skia" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="frameworks/opt/emoji" name="platform/frameworks/opt/emoji" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="libcore" name="platform/libcore" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="system/media" name="platform/system/media" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/svox" name="platform/external/svox" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/busybox" name="platform/external/busybox" revision="linaro_android_2.3.4" remote="linaro-android" />
-  <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_2.3.5" remote="linaro-android" />
-
-  <project path="hardware/libhardware" name="platform/hardware/libhardware" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project name="people/kwerner/libunwind" path="external/libunwind" remote="linaro-other" revision="fc05b927bc13c00d38a540f603f4fcb4f7325846" />
-
-  <!-- Multimedia extensions -->
-  <project path="external/libvpx" name="platform/external/libvpx" revision="linaro-master" remote="linaro-android" />
-  <project path="external/x264" name="platform/external/x264" revision="linaro-master" remote="linaro-android" />
-  <project path="external/ffmpeg" name="platform/external/ffmpeg" revision="linaro-0.8" remote="linaro-android" />
-
-  <!-- Power WG -->
-  <project path="external/powertop" name="platform/external/powertop"  remote="linaro-android" revision="linaro" />
-  <project path="external/ncurses" name="platform/external/ncurses"  remote="linaro-android" revision="linaro" />
-  <project path="external/libnl" name="platform/external/libnl"  remote="linaro-android" revision="linaro" />
-
-  <project path="build" name="platform/build" revision="linaro_android_2.3.5" remote="linaro-android" >
-    <copyfile src="core/root.mk" dest="Makefile" />
-  </project>
-
-  <project path="kernel" name="kernel/omap-omapzoom" revision="linaro_p-android-omap-3.0" remote="linaro-android" />
-  <project path="u-boot" name="boot/u-boot-linaro-stable" revision="master" remote="linaro-other" />
-
-  <project path="packages/apps/0xbench" name="0xbench" revision="master" remote="0xbench" />
-  <project path="packages/apps/mmtest" name="people/bernhardrosenkranzer/mmtest" revision="master" remote="linaro-other" />
-  <project path="packages/apps/glmark2" name="people/afrantzis/glmark2" revision="master" remote="linaro-other" />
-
-  <project path="external/jpeg" name="people/tomgall/libjpeg-turbo/libjpeg-turbo" revision="1.2-beta-linaro-andoid" remote="linaro-other" />
-  <project path="external/dbus" name="platform/external/dbus" revision="linaro-master" remote="linaro-android" />
-
-  <project path="bionic" name="platform/bionic" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/fdlibm" name="platform/external/fdlibm" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/icu4c" name="platform/external/icu4c" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/iptables" name="platform/external/iptables" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_2.3.5" remote="linaro-android" />
-
- <!-- x-loader -->
-  <project path="device/linaro/x-loader" name="x-loader/x-loader" revision="master" remote="gitorious" />
-
-  <!-- standard Andorid manifest -->
-  <project path="bootable/bootloader/legacy" name="platform/bootable/bootloader/legacy" />
-  <project path="bootable/diskinstaller" name="platform/bootable/diskinstaller" />
-  <project path="bootable/recovery" name="platform/bootable/recovery" />
-  <project path="cts" name="platform/cts" />
-  <project path="development" name="platform/development" />
-  <project path="device/common" name="device/common" />
-  <project path="device/google/accessory/arduino" name="device/google/accessory/arduino" />
-  <project path="device/google/accessory/demokit" name="device/google/accessory/demokit" />
-  <project path="device/sample" name="device/sample" />
-  <project path="device/samsung/crespo" name="device/samsung/crespo" />
-  <project path="external/apache-http" name="platform/external/apache-http" />
-  <project path="external/astl" name="platform/external/astl" />
-  <project path="external/bison" name="platform/external/bison" />
-  <project path="external/blktrace" name="platform/external/blktrace" />
-  <project path="external/bluetooth/bluez" name="platform/external/bluetooth/bluez" />
-  <project path="external/bluetooth/glib" name="platform/external/bluetooth/glib" />
-  <project path="external/bluetooth/hcidump" name="platform/external/bluetooth/hcidump" />
-  <project path="external/bouncycastle" name="platform/external/bouncycastle" />
-  <project path="external/bsdiff" name="platform/external/bsdiff" />
-  <project path="external/bzip2" name="platform/external/bzip2" />
-  <project path="external/chromium" name="platform/external/chromium" />
-  <project path="external/clearsilver" name="platform/external/clearsilver" />
-  <project path="external/dhcpcd" name="platform/external/dhcpcd" />
-  <project path="external/dropbear" name="platform/external/dropbear" />
-  <project path="external/e2fsprogs" name="platform/external/e2fsprogs" />
-  <project path="external/easymock" name="platform/external/easymock" />
-  <project path="external/elfutils" name="platform/external/elfutils" />
-  <project path="external/embunit" name="platform/external/embunit" />
-  <project path="external/emma" name="platform/external/emma" />
-  <project path="external/esd" name="platform/external/esd" />
-  <project path="external/expat" name="platform/external/expat" />
-  <project path="external/freetype" name="platform/external/freetype" />
-  <project path="external/fsck_msdos" name="platform/external/fsck_msdos" />
-  <project path="external/genext2fs" name="platform/external/genext2fs" />
-  <project path="external/giflib" name="platform/external/giflib" />
-  <project path="external/grub" name="platform/external/grub" />
-  <project path="external/gtest" name="platform/external/gtest" />
-  <project path="external/guava" name="platform/external/guava" />
-  <project path="external/iproute2" name="platform/external/iproute2" />
-  <project path="external/ipsec-tools" name="platform/external/ipsec-tools" />
-  <project path="external/jdiff" name="platform/external/jdiff" />
-  <project path="external/jhead" name="platform/external/jhead" />
-  <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/libgsm" name="platform/external/libgsm" />
-  <project path="external/libnfc-nxp" name="platform/external/libnfc-nxp" />
-  <project path="external/libpcap" name="platform/external/libpcap" />
-  <project path="external/libpng" name="platform/external/libpng" />
-  <project path="external/libxml2" name="platform/external/libxml2" />
-  <project path="external/mtpd" name="platform/external/mtpd" />
-  <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/nist-sip" name="platform/external/nist-sip" />
-  <project path="external/oauth" name="platform/external/oauth" />
-  <project path="external/openssl" name="platform/external/openssl" />
-  <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/protobuf" name="platform/external/protobuf" />
-  <project path="external/qemu" name="platform/external/qemu" />
-  <project path="external/quake" name="platform/external/quake" />
-  <project path="external/safe-iop" name="platform/external/safe-iop" />
-  <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/strace" name="platform/external/strace" />
-  <project path="external/tagsoup" name="platform/external/tagsoup" />
-  <project path="external/tinyxml" name="platform/external/tinyxml" />
-  <project path="external/tremolo" name="platform/external/tremolo" />
-  <project path="external/v8" name="platform/external/v8" />
-  <project path="external/wpa_supplicant" name="platform/external/wpa_supplicant" />
-  <project path="external/wpa_supplicant_6" name="platform/external/wpa_supplicant_6" />
-  <project path="external/xmlwriter" name="platform/external/xmlwriter" />
-  <project path="external/yaffs2" name="platform/external/yaffs2" />
-  <project path="external/zlib" name="platform/external/zlib" />
-  <project path="frameworks/ex" name="platform/frameworks/ex" />
-  <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" />
-  <project path="hardware/ril" name="platform/hardware/ril" />
-  <project path="ndk" name="platform/ndk" />
-  <project path="packages/apps/AccountsAndSyncSettings" name="platform/packages/apps/AccountsAndSyncSettings" />
-  <project path="packages/apps/Bluetooth" name="platform/packages/apps/Bluetooth" />
-  <project path="packages/apps/Browser" name="platform/packages/apps/Browser" />
-  <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="platform/packages/apps/Camera" />
-  <project path="packages/apps/CellBroadcastReceiver" name="platform/packages/apps/CellBroadcastReceiver" />
-  <project path="packages/apps/CertInstaller" name="platform/packages/apps/CertInstaller" />
-  <project path="packages/apps/Contacts" name="platform/packages/apps/Contacts" />
-  <project path="packages/apps/DeskClock" name="platform/packages/apps/DeskClock" />
-  <project path="packages/apps/Email" name="platform/packages/apps/Email" />
-  <project path="packages/apps/Gallery" name="platform/packages/apps/Gallery" />
-  <project path="packages/apps/Gallery3D" name="platform/packages/apps/Gallery3D" />
-  <project path="packages/apps/HTMLViewer" name="platform/packages/apps/HTMLViewer" />
-  <project path="packages/apps/Launcher2" name="platform/packages/apps/Launcher2" />
-  <project path="packages/apps/Mms" name="platform/packages/apps/Mms" />
-  <project path="packages/apps/Music" name="platform/packages/apps/Music" />
-  <project path="packages/apps/Nfc" name="platform/packages/apps/Nfc" />
-  <project path="packages/apps/PackageInstaller" name="platform/packages/apps/PackageInstaller" />
-  <project path="packages/apps/Phone" name="platform/packages/apps/Phone" />
-  <project path="packages/apps/Protips" name="platform/packages/apps/Protips" />
-  <project path="packages/apps/QuickSearchBox" name="platform/packages/apps/QuickSearchBox" />
-  <project path="packages/apps/SmartCardService" name="platform/packages/apps/SmartCardService" />
-  <project path="packages/apps/SoundRecorder" name="platform/packages/apps/SoundRecorder" />
-  <project path="packages/apps/SpeechRecorder" name="platform/packages/apps/SpeechRecorder" />
-  <project path="packages/apps/Stk" name="platform/packages/apps/Stk" />
-  <project path="packages/apps/Tag" name="platform/packages/apps/Tag" />
-  <project path="packages/apps/VoiceDialer" name="platform/packages/apps/VoiceDialer" />
-  <project path="packages/experimental" name="platform/packages/experimental" />
-  <project path="packages/inputmethods/LatinIME" name="platform/packages/inputmethods/LatinIME" />
-  <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="platform/packages/providers/DownloadProvider" />
-  <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="platform/packages/providers/MediaProvider" />
-  <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="platform/packages/wallpapers/Basic" />
-  <project path="packages/wallpapers/LivePicker" name="platform/packages/wallpapers/LivePicker" />
-  <project path="packages/wallpapers/MagicSmoke" name="platform/packages/wallpapers/MagicSmoke" />
-  <project path="packages/wallpapers/MusicVisualization" name="platform/packages/wallpapers/MusicVisualization" />
-  <project path="prebuilt" name="platform/prebuilt" />
-  <project path="sdk" name="platform/sdk" />
-  <project path="system/bluetooth" name="platform/system/bluetooth" />
-  <project path="system/extras" name="platform/system/extras" />
-  <project path="system/netd" name="platform/system/netd" />
-
-</manifest>
diff --git a/staging-origen.xml b/staging-origen.xml
index d4370d322..bc8bc3d7e 100644
--- a/staging-origen.xml
+++ b/staging-origen.xml
@@ -1,219 +1,190 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
-  <remote  name="korg"
-           fetch="git://android.git.linaro.org/"
-           review="review.android.git.linaro.org" />
-  <default revision="refs/tags/android-2.3.5_r1"
-           remote="korg" />
-
-  <remote  name="linaro-android"
-           fetch="git://android.git.linaro.org/"
-           review="review.android.git.linaro.org" />
-
-  <remote  name="linaro-other"
-           fetch="git://git.linaro.org/" />
-
-  <remote  name="0xbench"
-           fetch="git://gitorious.org/0xbench/" />
-
-  <remote  name="gitorious"
-           fetch="git://gitorious.org/" />
-
-  <remote  name="omapzoom"
-           fetch="git://git.omapzoom.org/repo/" />
-
-
-  <!-- Linaro changes -->
-  <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_2.3.5" remote="linaro-android" />
-
-  <project path="device/linaro/beagleboard" name="device/linaro/beagleboard" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="device/linaro/pandaboard" name="device/linaro/pandaboard" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="device/linaro/u8500href" name="device/linaro/u8500href" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="device/linaro/origen" name="device/linaro/origen" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="device/linaro/common" name="device/linaro/common" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="system/vold" name="platform/system/vold" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="system/core" name="platform/system/core" revision="linaro_android_2.3.5" remote="linaro-android" />
-
-  <project path="dalvik" name="platform/dalvik" revision="linaro_android_2.3.5" remote="linaro-android"/>
-  <project path="external/elfcopy" name="platform/external/elfcopy" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/skia" name="platform/external/skia" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="frameworks/opt/emoji" name="platform/frameworks/opt/emoji" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="libcore" name="platform/libcore" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="system/media" name="platform/system/media" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/svox" name="platform/external/svox" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/busybox" name="platform/external/busybox" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="hardware/libhardware" name="platform/hardware/libhardware" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/wpa_supplicant_6" name="platform/external/wpa_supplicant_6" revision="linaro_android_2.3.5" remote="linaro-android"/>
-  <project name="people/kwerner/libunwind" path="external/libunwind" remote="linaro-other" revision="fc05b927bc13c00d38a540f603f4fcb4f7325846" />
-
-  <!-- Multimedia extensions -->
-  <project path="external/libvpx" name="platform/external/libvpx" revision="linaro-master" remote="linaro-android" />
-  <project path="external/x264" name="platform/external/x264" revision="linaro-master" remote="linaro-android" />
-  <project path="external/ffmpeg" name="platform/external/ffmpeg" revision="linaro-0.8" remote="linaro-android" />
-
-  <!-- Power WG -->
-  <project path="external/powertop" name="platform/external/powertop"  remote="linaro-android" revision="linaro" />
-  <project path="external/ncurses" name="platform/external/ncurses"  remote="linaro-android" revision="linaro" />
-  <project path="external/libnl" name="platform/external/libnl"  remote="linaro-android" revision="linaro" />
-
-  <project path="build" name="platform/build" revision="linaro_android_2.3.5" remote="linaro-android" >
-    <copyfile src="core/root.mk" dest="Makefile" />
+  <remote fetch="git://gitorious.org/0xbench/" name="0xbench"/>
+  <remote fetch="git://gitorious.org/" name="gitorious"/>
+  <remote fetch="git://android.git.linaro.org/" name="korg" review="review.android.git.linaro.org"/>
+  <remote fetch="git://android.git.linaro.org/" name="linaro-android" review="review.android.git.linaro.org"/>
+  <remote fetch="git://git.linaro.org/" name="linaro-other"/>
+  <remote fetch="git://git.omapzoom.org/repo/" name="omapzoom"/>
+
+  <default remote="korg" revision="refs/tags/android-2.3.5_r1"/>
+
+  <project name="0xbench" path="packages/apps/0xbench" remote="0xbench" revision="1772a907e73e188317c60d5d9561551e5d9b6c5f"/>
+  <project name="device/common" revision="3b932551eb896cd1880e65b156059a5f34d2f655"/>
+  <project name="device/google/accessory/arduino" revision="ee3bb7c351e732e8f518cde0238bf9b3d810d80a"/>
+  <project name="device/google/accessory/demokit" revision="37921cd911a238cee5d79c6f63f84304c1ca36e0"/>
+  <project name="device/linaro/beagleboard" remote="linaro-android" revision="5029d2ca236dd840e9b2785ff4daeb7c9b627995"/>
+  <project name="device/linaro/common" remote="linaro-android" revision="1550de16d8bf3e80b333b73ee1dec7750fe552f8"/>
+  <project name="device/linaro/origen" remote="linaro-android" revision="dc6564ef13bdee7f85def7760f9affcc9ea7c444"/>
+  <project name="device/linaro/pandaboard" remote="linaro-android" revision="5dac14677e208091d28f540a38e98f8152e93b58"/>
+  <project name="device/linaro/u8500href" remote="linaro-android" revision="b316efeb3147ee8e236db39192671595570b783b"/>
+  <project name="device/sample" revision="e04c7b12e187584785a038e586b8aeccc82b33d0"/>
+  <project name="device/samsung/crespo" revision="6a740e418e0a2a9beddc4f31ee6607e90d420b17"/>
+  <project name="people/afrantzis/glmark2" path="packages/apps/glmark2" remote="linaro-other" revision="e3727c42da8cf7dd554df5d25c6ee249bad0a452"/>
+  <project name="people/angus/linux-linaro-3.0" path="kernel" remote="linaro-other" revision="783d09cb9ad46c4d3d941053eed8e6a37aa589f7"/>
+  <project name="people/angus/u-boot" path="u-boot" remote="linaro-other" revision="d6186aa24be4bed03617a0393d5f74baf89b5ecf"/>
+  <project name="people/bernhardrosenkranzer/mmtest" path="packages/apps/mmtest" remote="linaro-other" revision="7caaadf7a48c0322693f226d7a78b78f853d51c0"/>
+  <project name="people/kwerner/libunwind" path="external/libunwind" remote="linaro-other" revision="fc05b927bc13c00d38a540f603f4fcb4f7325846"/>
+  <project name="people/tomgall/libjpeg-turbo/libjpeg-turbo" path="external/jpeg" remote="linaro-other" revision="0206f26bd4229243a87b3519d251f9e4947b6b2a"/>
+  <project name="platform/bionic" path="bionic" remote="linaro-android" revision="46e1d893c41c20e3d348fb64414b8294a3eebcb2"/>
+  <project name="platform/bootable/bootloader/legacy" path="bootable/bootloader/legacy" revision="d3271024770ddcc2fb87dd22f8280764545ab05a"/>
+  <project name="platform/bootable/diskinstaller" path="bootable/diskinstaller" revision="53bd9111b5ae1fc1180ec13755d9830f7cadacf5"/>
+  <project name="platform/bootable/recovery" path="bootable/recovery" revision="7172eb7b623f4b30f5a709d639fcd3fb51cd6220"/>
+  <project name="platform/build" path="build" remote="linaro-android" revision="edec05c8c7186bea4befcf95054548db3a0143f9">
+    <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project path="kernel" name="people/angus/linux-linaro-3.0" remote="linaro-other" revision="android-2011.09"/>
-  <project path="u-boot" name="people/angus/u-boot" revision="origen" remote="linaro-other"/>
-
-  <project path="packages/apps/0xbench" name="0xbench" revision="master" remote="0xbench" />
-  <project path="packages/apps/mmtest" name="people/bernhardrosenkranzer/mmtest" revision="master" remote="linaro-other" />
-  <project path="packages/apps/glmark2" name="people/afrantzis/glmark2" revision="master" remote="linaro-other" />  
-
-  <project path="external/jpeg" name="people/tomgall/libjpeg-turbo/libjpeg-turbo" revision="1.2-beta-linaro-andoid" remote="linaro-other" />
-  <project path="external/dbus" name="platform/external/dbus" revision="linaro-master" remote="linaro-android" />
-  <project path="bionic" name="platform/bionic" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/fdlibm" name="platform/external/fdlibm" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/icu4c" name="platform/external/icu4c" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/iptables" name="platform/external/iptables" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_2.3.5" remote="linaro-android" />
-
-  <!-- x-loader -->
-  <project path="device/linaro/x-loader" name="x-loader/x-loader" revision="master" remote="gitorious" />
-
-  <!-- standard Andorid manifest -->
-  <project path="bootable/bootloader/legacy" name="platform/bootable/bootloader/legacy" />
-  <project path="bootable/diskinstaller" name="platform/bootable/diskinstaller" />
-  <project path="bootable/recovery" name="platform/bootable/recovery" />
-  <project path="cts" name="platform/cts" />
-  <project path="development" name="platform/development" />
-  <project path="device/common" name="device/common" />
-  <project path="device/google/accessory/arduino" name="device/google/accessory/arduino" />
-  <project path="device/google/accessory/demokit" name="device/google/accessory/demokit" />
-  <project path="device/sample" name="device/sample" />
-  <project path="device/samsung/crespo" name="device/samsung/crespo" />
-  <project path="external/apache-http" name="platform/external/apache-http" />
-  <project path="external/astl" name="platform/external/astl" />
-  <project path="external/bison" name="platform/external/bison" />
-  <project path="external/blktrace" name="platform/external/blktrace" />
-  <project path="external/bluetooth/bluez" name="platform/external/bluetooth/bluez" />
-  <project path="external/bluetooth/glib" name="platform/external/bluetooth/glib" />
-  <project path="external/bluetooth/hcidump" name="platform/external/bluetooth/hcidump" />
-  <project path="external/bouncycastle" name="platform/external/bouncycastle" />
-  <project path="external/bsdiff" name="platform/external/bsdiff" />
-  <project path="external/bzip2" name="platform/external/bzip2" />
-  <project path="external/chromium" name="platform/external/chromium" />
-  <project path="external/clearsilver" name="platform/external/clearsilver" />
-  <project path="external/dhcpcd" name="platform/external/dhcpcd" />
-  <project path="external/dropbear" name="platform/external/dropbear" />
-  <project path="external/e2fsprogs" name="platform/external/e2fsprogs" />
-  <project path="external/easymock" name="platform/external/easymock" />
-  <project path="external/elfutils" name="platform/external/elfutils" />
-  <project path="external/embunit" name="platform/external/embunit" />
-  <project path="external/emma" name="platform/external/emma" />
-  <project path="external/esd" name="platform/external/esd" />
-  <project path="external/expat" name="platform/external/expat" />
-  <project path="external/freetype" name="platform/external/freetype" />
-  <project path="external/fsck_msdos" name="platform/external/fsck_msdos" />
-  <project path="external/genext2fs" name="platform/external/genext2fs" />
-  <project path="external/giflib" name="platform/external/giflib" />
-  <project path="external/grub" name="platform/external/grub" />
-  <project path="external/gtest" name="platform/external/gtest" />
-  <project path="external/guava" name="platform/external/guava" />
-  <project path="external/iproute2" name="platform/external/iproute2" />
-  <project path="external/ipsec-tools" name="platform/external/ipsec-tools" />
-  <project path="external/jdiff" name="platform/external/jdiff" />
-  <project path="external/jhead" name="platform/external/jhead" />
-  <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/libgsm" name="platform/external/libgsm" />
-  <project path="external/libnfc-nxp" name="platform/external/libnfc-nxp" />
-  <project path="external/libpcap" name="platform/external/libpcap" />
-  <project path="external/libpng" name="platform/external/libpng" />
-  <project path="external/libxml2" name="platform/external/libxml2" />
-  <project path="external/mtpd" name="platform/external/mtpd" />
-  <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/nist-sip" name="platform/external/nist-sip" />
-  <project path="external/oauth" name="platform/external/oauth" />
-  <project path="external/openssl" name="platform/external/openssl" />
-  <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/protobuf" name="platform/external/protobuf" />
-  <project path="external/qemu" name="platform/external/qemu" />
-  <project path="external/quake" name="platform/external/quake" />
-  <project path="external/safe-iop" name="platform/external/safe-iop" />
-  <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/strace" name="platform/external/strace" />
-  <project path="external/tagsoup" name="platform/external/tagsoup" />
-  <project path="external/tinyxml" name="platform/external/tinyxml" />
-  <project path="external/tremolo" name="platform/external/tremolo" />
-  <project path="external/v8" name="platform/external/v8" />
-  <project path="external/wpa_supplicant" name="platform/external/wpa_supplicant" />
-  <project path="external/xmlwriter" name="platform/external/xmlwriter" />
-  <project path="external/yaffs2" name="platform/external/yaffs2" />
-  <project path="external/zlib" name="platform/external/zlib" />
-  <project path="frameworks/ex" name="platform/frameworks/ex" />
-  <project path="hardware/ril" name="platform/hardware/ril" />
-  <project path="ndk" name="platform/ndk" />
-  <project path="packages/apps/AccountsAndSyncSettings" name="platform/packages/apps/AccountsAndSyncSettings" />
-  <project path="packages/apps/Bluetooth" name="platform/packages/apps/Bluetooth" />
-  <project path="packages/apps/Browser" name="platform/packages/apps/Browser" />
-  <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="platform/packages/apps/Camera" />
-  <project path="packages/apps/CellBroadcastReceiver" name="platform/packages/apps/CellBroadcastReceiver" />
-  <project path="packages/apps/CertInstaller" name="platform/packages/apps/CertInstaller" />
-  <project path="packages/apps/Contacts" name="platform/packages/apps/Contacts" />
-  <project path="packages/apps/DeskClock" name="platform/packages/apps/DeskClock" />
-  <project path="packages/apps/Email" name="platform/packages/apps/Email" />
-  <project path="packages/apps/Gallery" name="platform/packages/apps/Gallery" />
-  <project path="packages/apps/Gallery3D" name="platform/packages/apps/Gallery3D" />
-  <project path="packages/apps/HTMLViewer" name="platform/packages/apps/HTMLViewer" />
-  <project path="packages/apps/Launcher2" name="platform/packages/apps/Launcher2" />
-  <project path="packages/apps/Mms" name="platform/packages/apps/Mms" />
-  <project path="packages/apps/Music" name="platform/packages/apps/Music" />
-  <project path="packages/apps/Nfc" name="platform/packages/apps/Nfc" />
-  <project path="packages/apps/PackageInstaller" name="platform/packages/apps/PackageInstaller" />
-  <project path="packages/apps/Phone" name="platform/packages/apps/Phone" />
-  <project path="packages/apps/Protips" name="platform/packages/apps/Protips" />
-  <project path="packages/apps/QuickSearchBox" name="platform/packages/apps/QuickSearchBox" />
-  <project path="packages/apps/SmartCardService" name="platform/packages/apps/SmartCardService" />
-  <project path="packages/apps/SoundRecorder" name="platform/packages/apps/SoundRecorder" />
-  <project path="packages/apps/SpeechRecorder" name="platform/packages/apps/SpeechRecorder" />
-  <project path="packages/apps/Stk" name="platform/packages/apps/Stk" />
-  <project path="packages/apps/Tag" name="platform/packages/apps/Tag" />
-  <project path="packages/apps/VoiceDialer" name="platform/packages/apps/VoiceDialer" />
-  <project path="packages/experimental" name="platform/packages/experimental" />
-  <project path="packages/inputmethods/LatinIME" name="platform/packages/inputmethods/LatinIME" />
-  <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="platform/packages/providers/DownloadProvider" />
-  <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="platform/packages/providers/MediaProvider" />
-  <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="platform/packages/wallpapers/Basic" />
-  <project path="packages/wallpapers/LivePicker" name="platform/packages/wallpapers/LivePicker" />
-  <project path="packages/wallpapers/MagicSmoke" name="platform/packages/wallpapers/MagicSmoke" />
-  <project path="packages/wallpapers/MusicVisualization" name="platform/packages/wallpapers/MusicVisualization" />
-  <project path="prebuilt" name="platform/prebuilt" />
-  <project path="sdk" name="platform/sdk" />
-  <project path="system/bluetooth" name="platform/system/bluetooth" />
-  <project path="system/extras" name="platform/system/extras" />
-  <project path="system/netd" name="platform/system/netd" />
-
+  <project name="platform/cts" path="cts" revision="6b4d831147bd65bc5a3d3e23c05626c831151615"/>
+  <project name="platform/dalvik" path="dalvik" remote="linaro-android" revision="87dc8dd69f81bb07007969dee9e71bce7fa82807"/>
+  <project name="platform/development" path="development" revision="f60f95391262f2295b9173e23a9344c8322d604a"/>
+  <project name="platform/external/apache-http" path="external/apache-http" revision="b91c5e936342afbdd58c88ac604d5dd505d0fe0c"/>
+  <project name="platform/external/astl" path="external/astl" revision="c3c760978c34d5eeea1205c0bf7f27444e192a98"/>
+  <project name="platform/external/bison" path="external/bison" revision="889df9c1efa7ca5de113407ab7793b57a6db677d"/>
+  <project name="platform/external/blktrace" path="external/blktrace" revision="ac4461c3b3e7bcbafe5336b9478657d0fa3e08aa"/>
+  <project name="platform/external/bluetooth/bluez" path="external/bluetooth/bluez" revision="02e98694ef87ea8ecb47789abf89c3f945ee0e20"/>
+  <project name="platform/external/bluetooth/glib" path="external/bluetooth/glib" revision="0c01eb3a7313a580fe34044bcdc3337d067c8a15"/>
+  <project name="platform/external/bluetooth/hcidump" path="external/bluetooth/hcidump" revision="ce36a6c7c5f8043c038415d8e270d55d9834008d"/>
+  <project name="platform/external/bouncycastle" path="external/bouncycastle" revision="3ab12958718f17e48e2816a84d403f6305cc2800"/>
+  <project name="platform/external/bsdiff" path="external/bsdiff" revision="df980d633fd0bdc0b89af26630f543d91bb87e68"/>
+  <project name="platform/external/busybox" path="external/busybox" remote="linaro-android" revision="496c5fca645e6b724b162e66931e446a85fc49d3"/>
+  <project name="platform/external/bzip2" path="external/bzip2" revision="879585bbef51b4cabaac6340a95d807dca379cdc"/>
+  <project name="platform/external/chromium" path="external/chromium" revision="5e43ad9465e402d595a3c960784b1effe2e9bd88"/>
+  <project name="platform/external/clearsilver" path="external/clearsilver" revision="3e15867df7fb41770c090ee40411a6c376574ae3"/>
+  <project name="platform/external/dbus" path="external/dbus" remote="linaro-android" revision="97b3dae199a09f003fd60fe63f1b17ec0fa5fb76"/>
+  <project name="platform/external/dhcpcd" path="external/dhcpcd" revision="17fdc0dee1db0246a59cd3b28278389043fe5134"/>
+  <project name="platform/external/dnsmasq" path="external/dnsmasq" remote="linaro-android" revision="ebf5da42ba598621e9dbb878196254e83c91d8fc"/>
+  <project name="platform/external/dropbear" path="external/dropbear" revision="d3a3a803df8f32e9ba26758b3a9d7fbd27a3dc9c"/>
+  <project name="platform/external/e2fsprogs" path="external/e2fsprogs" revision="6641b4da8001b46fd17e723a572459db0325e023"/>
+  <project name="platform/external/easymock" path="external/easymock" revision="17d5eb4006c438775d8eaa7600e947e4ac090a18"/>
+  <project name="platform/external/elfcopy" path="external/elfcopy" remote="linaro-android" revision="0513f4c3119ad2ca0b302eedefc58cc7f470d6de"/>
+  <project name="platform/external/elfutils" path="external/elfutils" revision="84cf4183ba6f577ee01abe7f1f5a6d4b23df35a8"/>
+  <project name="platform/external/embunit" path="external/embunit" revision="f5eb8b0c9abf1e9911b5c84a555bc495651595e5"/>
+  <project name="platform/external/emma" path="external/emma" revision="4d37e21b7c2fa378dbf7cfe2ea57d7f5991fe6cd"/>
+  <project name="platform/external/esd" path="external/esd" revision="224a67f2683a7ee997179fc5dd16115e39987b0f"/>
+  <project name="platform/external/expat" path="external/expat" revision="204e2ef0e1a2c2da0087cccb0c9b618d52f1d584"/>
+  <project name="platform/external/fdlibm" path="external/fdlibm" remote="linaro-android" revision="a74d3139b5e2046e52a94f6b1510d5e3d15c2bc1"/>
+  <project name="platform/external/ffmpeg" path="external/ffmpeg" remote="linaro-android" revision="6d020211c1fb464b956c203e6cc5a0e157d1eb13"/>
+  <project name="platform/external/freetype" path="external/freetype" revision="aacb8e1368a883fcbc9fe64fd0e460cef9c9b20c"/>
+  <project name="platform/external/fsck_msdos" path="external/fsck_msdos" revision="b6ee08aadb580341a4d80943741b80de16a88b5d"/>
+  <project name="platform/external/genext2fs" path="external/genext2fs" revision="28f10892a39db10b1c65125723d9737de865ef56"/>
+  <project name="platform/external/giflib" path="external/giflib" revision="b2597268aef084202a8c349d1cc072c03c6e22eb"/>
+  <project name="platform/external/grub" path="external/grub" revision="a0be411871f2e71834a2cd75dea882d732557530"/>
+  <project name="platform/external/gtest" path="external/gtest" revision="75f109c3120bf78ee89124f1f21b50ea24225236"/>
+  <project name="platform/external/guava" path="external/guava" revision="5fa17bce47c47d5538beaaef0e38f0576446709c"/>
+  <project name="platform/external/icu4c" path="external/icu4c" remote="linaro-android" revision="0fd910cf8e8f3681d7a727f09273ce76dbfe4ec9"/>
+  <project name="platform/external/iproute2" path="external/iproute2" revision="14740a4557728ba63348e0574507a71fa40a8bd4"/>
+  <project name="platform/external/ipsec-tools" path="external/ipsec-tools" revision="f5d0d0919f6c0b82611c1f8ad0cb6023a78b6ce0"/>
+  <project name="platform/external/iptables" path="external/iptables" remote="linaro-android" revision="4ebfa4c82fc82e25e1206a9197809062d5d4f306"/>
+  <project name="platform/external/jdiff" path="external/jdiff" revision="590cef7c1b48c9c3f4556ae65fbc0065d65da54a"/>
+  <project name="platform/external/jhead" path="external/jhead" revision="fd983181d9043cdf45497ace19c60fd9e4e1799c"/>
+  <project name="platform/external/jsr305" path="external/jsr305" revision="8e937939899d5fe3a6864c7ecb9bb8632678a7c7"/>
+  <project name="platform/external/junit" path="external/junit" revision="e9b8080d6d80d17729e0b7f8b1d2b573b3456cc4"/>
+  <project name="platform/external/kernel-headers" path="external/kernel-headers" revision="8abdcd4098f266e438e7129a3dfe311005686431"/>
+  <project name="platform/external/libffi" path="external/libffi" revision="5dea54fd57265ce037ac94055b9f94a45558b39e"/>
+  <project name="platform/external/libgsm" path="external/libgsm" revision="5e4516958690b9a1b2c98f88eeecba3edd2dbda4"/>
+  <project name="platform/external/libnfc-nxp" path="external/libnfc-nxp" revision="178bcc31188d60d13e7455c14e9fd902f5505331"/>
+  <project name="platform/external/libnl" path="external/libnl" remote="linaro-android" revision="bbcb553f0f4636dd40e84d320a576b3de7b95357"/>
+  <project name="platform/external/libpcap" path="external/libpcap" revision="3a7bce5dda6a8db92c9248846d0255e68c3a5b2a"/>
+  <project name="platform/external/libpng" path="external/libpng" revision="4ce0ee15f268e0161438b4133936cb2826f7fd50"/>
+  <project name="platform/external/libvpx" path="external/libvpx" remote="linaro-android" revision="62644e5902d0ea9de45ed57442587020a21115e7"/>
+  <project name="platform/external/libxml2" path="external/libxml2" revision="f16b5fdc2102953f6b915472200061e17e76702b"/>
+  <project name="platform/external/mtpd" path="external/mtpd" revision="fccbc17685cd8bd43cf1c1e533c4d02f6f79d667"/>
+  <project name="platform/external/ncurses" path="external/ncurses" remote="linaro-android" revision="5fc466743430377a29b0dc6a38b0d1de843581e7"/>
+  <project name="platform/external/netcat" path="external/netcat" revision="fc2dc55c510657073ef4235658167a878e82cefa"/>
+  <project name="platform/external/netperf" path="external/netperf" revision="58ecd3b7c76263900e38921360e334a416aec362"/>
+  <project name="platform/external/neven" path="external/neven" revision="7164d6ac08ab9fc1247aa29f1dafd0ef7808f0f2"/>
+  <project name="platform/external/nist-sip" path="external/nist-sip" revision="a58e4068f86c6ca3f9771d4ec8b2665d070a170e"/>
+  <project name="platform/external/oauth" path="external/oauth" revision="c76276a1d6165cfb502b06f65b1735fef0754d26"/>
+  <project name="platform/external/openssl" path="external/openssl" revision="f07bf9fa6a96c0039e832242569c8e6fc40c9a94"/>
+  <project name="platform/external/oprofile" path="external/oprofile" revision="041ee6ccda354960ebc1e1ccfff78685ec5326e1"/>
+  <project name="platform/external/ping" path="external/ping" revision="f35ea57ab6d01badde92491274ff2d74cbe3cf01"/>
+  <project name="platform/external/powertop" path="external/powertop" remote="linaro-android" revision="3d1c205aabb9a0451c6b3fe7846e8cce5521c727"/>
+  <project name="platform/external/ppp" path="external/ppp" revision="d88bff8f5384285f76576eb7707c6d9d5b98edb6"/>
+  <project name="platform/external/proguard" path="external/proguard" revision="6660cb6cb4231a03a3c02127fa5c4e7828422caa"/>
+  <project name="platform/external/protobuf" path="external/protobuf" revision="3574de1ca8301e1e13d1c89f2e2a902499d6bae9"/>
+  <project name="platform/external/qemu" path="external/qemu" revision="2fa5173bd1ce7341c50adac676a317945f0969c7"/>
+  <project name="platform/external/quake" path="external/quake" revision="9b0abf864353d47404417c1cbd8384e15be547b0"/>
+  <project name="platform/external/safe-iop" path="external/safe-iop" revision="07073634e2e3aa4f518e36ed5dec3aabc549d5fb"/>
+  <project name="platform/external/skia" path="external/skia" remote="linaro-android" revision="b17b930777b5c84e9a8048147577646a58a6a0fc"/>
+  <project name="platform/external/sonivox" path="external/sonivox" revision="d029b2378170cfd7bb34d894482065a762a54578"/>
+  <project name="platform/external/speex" path="external/speex" revision="32e4d0aa78c5879565cbcd06415fa2e344036ab5"/>
+  <project name="platform/external/sqlite" path="external/sqlite" revision="90f23688416d9f4e1e5d0128dca5f26404b6898e"/>
+  <project name="platform/external/srec" path="external/srec" revision="7390035ea61b32477243d60c452664150b61f023"/>
+  <project name="platform/external/stlport" path="external/stlport" remote="linaro-android" revision="f56d1f0242e7eb2800f552e3c3c562b02c26b2b2"/>
+  <project name="platform/external/strace" path="external/strace" revision="cfa96b379cdd6561a5cc89f2bb86ee9f4b2a3928"/>
+  <project name="platform/external/svox" path="external/svox" remote="linaro-android" revision="c54cda009637d7be08e4cd5b829ec0fc3079f60f"/>
+  <project name="platform/external/tagsoup" path="external/tagsoup" revision="68c2ec9e0acdb3214b7fb91dbab8c9fab8736817"/>
+  <project name="platform/external/tcpdump" path="external/tcpdump" remote="linaro-android" revision="616015d52648c7eb6460eb6411aa87581cbb0e13"/>
+  <project name="platform/external/tinyxml" path="external/tinyxml" revision="d589f7e4a51e75bd5c98a3defd8ee84d7059e86e"/>
+  <project name="platform/external/tremolo" path="external/tremolo" revision="9a688754461ebfc91769b5d3c8ba5aba9fe1f376"/>
+  <project name="platform/external/v8" path="external/v8" revision="6599b9dd3411791c9d89ab7efbfb4131e5664c48"/>
+  <project name="platform/external/webkit" path="external/webkit" remote="linaro-android" revision="1e02484fcaef9e1ea900b6e3323b8907c79b4bb2"/>
+  <project name="platform/external/wpa_supplicant" path="external/wpa_supplicant" revision="2b7ee495307e9fd349a0f37ec560834adbc954cc"/>
+  <project name="platform/external/wpa_supplicant_6" path="external/wpa_supplicant_6" remote="linaro-android" revision="981fc47b45bd7d97ea56dac8f33cc95cc4c71e6b"/>
+  <project name="platform/external/x264" path="external/x264" remote="linaro-android" revision="c8be2223e23a49c852557881d8210a70aae9cb5c"/>
+  <project name="platform/external/xmlwriter" path="external/xmlwriter" revision="e95d92246ee35273dde2bee8b00485cc14c12be5"/>
+  <project name="platform/external/yaffs2" path="external/yaffs2" revision="0fe811d9a994dd6df8aa9852c7b9241fa9aa453b"/>
+  <project name="platform/external/zlib" path="external/zlib" revision="96c70b1df1629d7f0eb8f666045bfd5eb062cebf"/>
+  <project name="platform/frameworks/base" path="frameworks/base" remote="linaro-android" revision="a08dc19c13967d6efa54443c21918288d5fb4178"/>
+  <project name="platform/frameworks/ex" path="frameworks/ex" revision="e0d5045a56146f0e7d8ea9e400f6eb209edceec5"/>
+  <project name="platform/frameworks/opt/emoji" path="frameworks/opt/emoji" remote="linaro-android" revision="941fb3d38928a8483701fe2be45ccbc6579f3633"/>
+  <project name="platform/hardware/libhardware" path="hardware/libhardware" remote="linaro-android" revision="f50b075a8b88eff482628e8ab62a04539117c7ea"/>
+  <project name="platform/hardware/libhardware_legacy" path="hardware/libhardware_legacy" remote="linaro-android" revision="65a03e4ba7f8981a1c8f0849a8af6c31c2825a41"/>
+  <project name="platform/hardware/ril" path="hardware/ril" revision="3b1530aef62476248825a2092c9aea800395c3b1"/>
+  <project name="platform/libcore" path="libcore" remote="linaro-android" revision="b390cef44c168f9a6cfa8b70cc7861869ab3be5d"/>
+  <project name="platform/ndk" path="ndk" revision="7a619be40e8594a961066a33b7cc9ef52f566988"/>
+  <project name="platform/packages/apps/AccountsAndSyncSettings" path="packages/apps/AccountsAndSyncSettings" revision="0179779e69d0a8ce2879cf27261af9bc2908cae0"/>
+  <project name="platform/packages/apps/Bluetooth" path="packages/apps/Bluetooth" revision="6d48feaaff63b14adc23e7b2d82854189a456f15"/>
+  <project name="platform/packages/apps/Browser" path="packages/apps/Browser" revision="7b6955578d914557eea7ff3cbcec70e953970092"/>
+  <project name="platform/packages/apps/Calculator" path="packages/apps/Calculator" revision="5c85e48a713ec70ebce65ebf1a3622035992f8c3"/>
+  <project name="platform/packages/apps/Calendar" path="packages/apps/Calendar" revision="ee794988e54a2e8172b1482d108924934c0f70cb"/>
+  <project name="platform/packages/apps/Camera" path="packages/apps/Camera" revision="8ff2adc739ca898d0230c702eed7d327e5bbf4dc"/>
+  <project name="platform/packages/apps/CellBroadcastReceiver" path="packages/apps/CellBroadcastReceiver" revision="50a624a47ce645a7992e346e40a4e7ec5e0df9b7"/>
+  <project name="platform/packages/apps/CertInstaller" path="packages/apps/CertInstaller" revision="457ffda6726b8e0f88d78a9267b840d102a8907a"/>
+  <project name="platform/packages/apps/Contacts" path="packages/apps/Contacts" revision="ec0e540fb20a31f77ca561bc4a872e817195627a"/>
+  <project name="platform/packages/apps/DeskClock" path="packages/apps/DeskClock" revision="8e1921f8140f205c115582e4a068c7ba5e79ff9c"/>
+  <project name="platform/packages/apps/Email" path="packages/apps/Email" revision="8c23a70b9123b77511e3ed9bbe827fe0c26bb674"/>
+  <project name="platform/packages/apps/Gallery" path="packages/apps/Gallery" revision="ea32625b6296585a0328886c33159d88e3a2c693"/>
+  <project name="platform/packages/apps/Gallery3D" path="packages/apps/Gallery3D" revision="87a545419820bc665d8fdb13845b65cf9707a7d8"/>
+  <project name="platform/packages/apps/HTMLViewer" path="packages/apps/HTMLViewer" revision="f470146b74d34c21e4d3526574e2bbd0e72a57f0"/>
+  <project name="platform/packages/apps/Launcher2" path="packages/apps/Launcher2" revision="3fd010a6fe457a59d2e983a348e63dc25e836852"/>
+  <project name="platform/packages/apps/Mms" path="packages/apps/Mms" revision="fd1766e6613390ac9d7c0dd8feac8708fa023a2b"/>
+  <project name="platform/packages/apps/Music" path="packages/apps/Music" revision="278aaed1eb37763f7dcb2364523db591014a9210"/>
+  <project name="platform/packages/apps/Nfc" path="packages/apps/Nfc" revision="e4d9ddebb676325c6abfe3b0d4c0aefa8a17d952"/>
+  <project name="platform/packages/apps/PackageInstaller" path="packages/apps/PackageInstaller" revision="6d2974c3f346511f96eba3370398123422e578fc"/>
+  <project name="platform/packages/apps/Phone" path="packages/apps/Phone" revision="54c42aebae50804cb620a35f0f82dd2ce2187e53"/>
+  <project name="platform/packages/apps/Protips" path="packages/apps/Protips" revision="a853d2b914144dd1f2ff3f03170f67d74338815d"/>
+  <project name="platform/packages/apps/QuickSearchBox" path="packages/apps/QuickSearchBox" revision="e8b28b6f1cab74060ea3101b1eee1dfdb32c89e9"/>
+  <project name="platform/packages/apps/Settings" path="packages/apps/Settings" remote="linaro-android" revision="ee25812a8eda802cc144dc416f2dca88d421bcef"/>
+  <project name="platform/packages/apps/SmartCardService" path="packages/apps/SmartCardService" revision="29eae320a4bd222b5ff1c092f84f1aebba88d0b7"/>
+  <project name="platform/packages/apps/SoundRecorder" path="packages/apps/SoundRecorder" revision="20b07a73ec046d23f5cfabaf60d54feb868a5eea"/>
+  <project name="platform/packages/apps/SpeechRecorder" path="packages/apps/SpeechRecorder" revision="f075eb5cefb6357aa7562a6d156bda5383ac087d"/>
+  <project name="platform/packages/apps/Stk" path="packages/apps/Stk" revision="d2f267c7ed48dc77878299e12925bc3c39db5d37"/>
+  <project name="platform/packages/apps/Tag" path="packages/apps/Tag" revision="4b1e01421a564b348fcf7c0203dcb89576883aff"/>
+  <project name="platform/packages/apps/VoiceDialer" path="packages/apps/VoiceDialer" revision="13b6acf2174e8dc23f70def279c85d191c3fcbc1"/>
+  <project name="platform/packages/experimental" path="packages/experimental" revision="504fe3ddddf722e4315b382319970b0e435af27b"/>
+  <project name="platform/packages/inputmethods/LatinIME" path="packages/inputmethods/LatinIME" revision="ec622ced359cfe646efc14b68e25539fa7a438d9"/>
+  <project name="platform/packages/inputmethods/OpenWnn" path="packages/inputmethods/OpenWnn" revision="27ab9d1b806f03554d2abb50de26abe7bf234336"/>
+  <project name="platform/packages/inputmethods/PinyinIME" path="packages/inputmethods/PinyinIME" revision="6b7954e2967754a77c55dc4291941978e3508259"/>
+  <project name="platform/packages/providers/ApplicationsProvider" path="packages/providers/ApplicationsProvider" revision="0234d298ecdffe3a10877d6edffe98e299713caa"/>
+  <project name="platform/packages/providers/CalendarProvider" path="packages/providers/CalendarProvider" revision="959739d351af5d04e8c92f6b031f737348d4b139"/>
+  <project name="platform/packages/providers/ContactsProvider" path="packages/providers/ContactsProvider" revision="c9d8e21bd1e6dbde3208b9475a2697081f8ced79"/>
+  <project name="platform/packages/providers/DownloadProvider" path="packages/providers/DownloadProvider" revision="abb94fb35445de2eadd1804ad2f4023bd50a6b5c"/>
+  <project name="platform/packages/providers/DrmProvider" path="packages/providers/DrmProvider" revision="42f3f2cbfecbbca1d18a5ff91e12619eba740516"/>
+  <project name="platform/packages/providers/GoogleContactsProvider" path="packages/providers/GoogleContactsProvider" revision="4886c7a0cfba5df74b213b1fc8286c6e3f2ddaa2"/>
+  <project name="platform/packages/providers/MediaProvider" path="packages/providers/MediaProvider" revision="2b0e56b7595da308d61d190b529518cdefc98acd"/>
+  <project name="platform/packages/providers/TelephonyProvider" path="packages/providers/TelephonyProvider" revision="6a5c080b90613c5afef04d453ab1498d22aee0a9"/>
+  <project name="platform/packages/providers/UserDictionaryProvider" path="packages/providers/UserDictionaryProvider" revision="d7eb9d4b59640175877a6f53f32b6e3e3d7154e9"/>
+  <project name="platform/packages/wallpapers/Basic" path="packages/wallpapers/Basic" revision="17db0721c8ef2d4f2c6835afaa3c47464730d9b1"/>
+  <project name="platform/packages/wallpapers/LivePicker" path="packages/wallpapers/LivePicker" revision="c114657db62c84b3b10c4e7d879d90ca5fc81d20"/>
+  <project name="platform/packages/wallpapers/MagicSmoke" path="packages/wallpapers/MagicSmoke" revision="4cb26a827ca03cad77522862cc78248e052ea0ca"/>
+  <project name="platform/packages/wallpapers/MusicVisualization" path="packages/wallpapers/MusicVisualization" revision="6759a52f863f60a67941938bd8d4610b01f9d2aa"/>
+  <project name="platform/prebuilt" path="prebuilt" revision="6b399f3609ac871310e9e51ff76393be605c6088"/>
+  <project name="platform/sdk" path="sdk" revision="dee444f860076b07d4b751fa64aba6683b4c377d"/>
+  <project name="platform/system/bluetooth" path="system/bluetooth" revision="7dc550597f490a67c8d020c727bfbf2d9d212d42"/>
+  <project name="platform/system/core" path="system/core" remote="linaro-android" revision="474bcaf1cbf12ff9007181a8093d2c12bc49d5b1"/>
+  <project name="platform/system/extras" path="system/extras" revision="8bdbbe2de23a8a8fc26b7f3a4b7dfdbe1112ac9f"/>
+  <project name="platform/system/media" path="system/media" remote="linaro-android" revision="bb5a707fe803083070c0d7ce475a0b898a522c22"/>
+  <project name="platform/system/netd" path="system/netd" revision="4415a6992691845c86bbb7b8ac9bd4c620338daa"/>
+  <project name="platform/system/vold" path="system/vold" remote="linaro-android" revision="119e194d52621f51892a0c7397f11637c0a5ec69"/>
+  <project name="x-loader/x-loader" path="device/linaro/x-loader" remote="gitorious" revision="c4289f1bee035dea41536c5ba5e1bc36c7d493c4"/>
 </manifest>
diff --git a/staging-panda.xml b/staging-panda.xml
index 398146564..e1533142a 100644
--- a/staging-panda.xml
+++ b/staging-panda.xml
@@ -1,226 +1,191 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
-  <remote  name="korg"
-           fetch="git://android.git.linaro.org/"
-           review="review.android.git.linaro.org" />
-  <default revision="refs/tags/android-2.3.5_r1"
-           remote="korg" />
-
-  <remote  name="linaro-android"
-           fetch="git://android.git.linaro.org/"
-           review="review.android.git.linaro.org" />
-
-  <remote  name="linaro-other"
-           fetch="git://git.linaro.org/" />
-
-  <remote  name="0xbench"
-           fetch="git://gitorious.org/0xbench/" />
-
-  <remote  name="gitorious"
-           fetch="git://gitorious.org/" />
-
-  <remote  name="omapzoom"
-           fetch="git://git.omapzoom.org/repo/" />
-
-
-  <!-- Linaro changes -->
-  <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_2.3.5" remote="linaro-android" />
-
-  <project path="device/linaro/beagleboard" name="device/linaro/beagleboard" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="device/linaro/pandaboard" name="device/linaro/pandaboard" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="device/linaro/u8500href" name="device/linaro/u8500href" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="device/linaro/common" name="device/linaro/common" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="system/vold" name="platform/system/vold" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="system/core" name="platform/system/core" revision="linaro_android_2.3.5" remote="linaro-android" />
-
-  <project path="dalvik" name="platform/dalvik" revision="linaro_android_2.3.5" remote="linaro-android"/>
-  <project path="external/elfcopy" name="platform/external/elfcopy" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/skia" name="platform/external/skia" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="frameworks/opt/emoji" name="platform/frameworks/opt/emoji" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="libcore" name="platform/libcore" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="system/media" name="platform/system/media" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/svox" name="platform/external/svox" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/busybox" name="platform/external/busybox" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/wpa_supplicant_6" name="platform/external/wpa_supplicant_6" revision="linaro_android_2.3.5" remote="linaro-android"/>
-  <project name="people/kwerner/libunwind" path="external/libunwind" remote="linaro-other" revision="fc05b927bc13c00d38a540f603f4fcb4f7325846" />
-
-  <!-- Multimedia extensions -->
-  <project path="external/libvpx" name="platform/external/libvpx" revision="linaro-master" remote="linaro-android" />
-  <project path="external/x264" name="platform/external/x264" revision="linaro-master" remote="linaro-android" />
-  <project path="external/ffmpeg" name="platform/external/ffmpeg" revision="linaro-0.8" remote="linaro-android" />
-
-  <!-- Power WG -->
-  <project path="external/powertop" name="platform/external/powertop"  remote="linaro-android" revision="linaro" />
-  <project path="external/ncurses" name="platform/external/ncurses"  remote="linaro-android" revision="linaro" />
-  <project path="external/libnl" name="platform/external/libnl"  remote="linaro-android" revision="linaro" />
-
-  <project path="build" name="platform/build" revision="linaro_android_2.3.5" remote="linaro-android" >
-    <copyfile src="core/root.mk" dest="Makefile" />
+  <remote fetch="git://gitorious.org/0xbench/" name="0xbench"/>
+  <remote fetch="git://gitorious.org/" name="gitorious"/>
+  <remote fetch="git://android.git.linaro.org/" name="korg" review="review.android.git.linaro.org"/>
+  <remote fetch="git://android.git.linaro.org/" name="linaro-android" review="review.android.git.linaro.org"/>
+  <remote fetch="git://git.linaro.org/" name="linaro-other"/>
+  <remote fetch="git://git.omapzoom.org/repo/" name="omapzoom"/>
+
+  <default remote="korg" revision="refs/tags/android-2.3.5_r1"/>
+
+  <project name="0xbench" path="packages/apps/0xbench" remote="0xbench" revision="1772a907e73e188317c60d5d9561551e5d9b6c5f"/>
+  <project name="boot/u-boot-linaro-stable" path="u-boot" remote="linaro-other" revision="de7b464fe0a2f841db43556df422409c577830fb"/>
+  <project name="device/common" revision="3b932551eb896cd1880e65b156059a5f34d2f655"/>
+  <project name="device/google/accessory/arduino" revision="ee3bb7c351e732e8f518cde0238bf9b3d810d80a"/>
+  <project name="device/google/accessory/demokit" revision="37921cd911a238cee5d79c6f63f84304c1ca36e0"/>
+  <project name="device/linaro/beagleboard" remote="linaro-android" revision="5029d2ca236dd840e9b2785ff4daeb7c9b627995"/>
+  <project name="device/linaro/common" remote="linaro-android" revision="1550de16d8bf3e80b333b73ee1dec7750fe552f8"/>
+  <project name="device/linaro/pandaboard" remote="linaro-android" revision="5dac14677e208091d28f540a38e98f8152e93b58"/>
+  <project name="device/linaro/u8500href" remote="linaro-android" revision="b316efeb3147ee8e236db39192671595570b783b"/>
+  <project name="device/sample" revision="e04c7b12e187584785a038e586b8aeccc82b33d0"/>
+  <project name="device/samsung/crespo" revision="6a740e418e0a2a9beddc4f31ee6607e90d420b17"/>
+  <project name="device/ti/proprietary-open" remote="linaro-android" revision="35c1da74f47c34a750ca788e0f2d7b200f37f0d7"/>
+  <project name="device/ti/uim" remote="linaro-android" revision="20f65b810f78dd6a74ddef1aaf8e6cb5c69be9d8"/>
+  <project name="people/afrantzis/glmark2" path="packages/apps/glmark2" remote="linaro-other" revision="e3727c42da8cf7dd554df5d25c6ee249bad0a452"/>
+  <project name="people/andygreen/repo-branch-archive" path="kernel" remote="linaro-other" revision="3e07d515113ba23d4ee09d7f414366e0e67fc919"/>
+  <project name="people/bernhardrosenkranzer/mmtest" path="packages/apps/mmtest" remote="linaro-other" revision="7caaadf7a48c0322693f226d7a78b78f853d51c0"/>
+  <project name="people/kwerner/libunwind" path="external/libunwind" remote="linaro-other" revision="fc05b927bc13c00d38a540f603f4fcb4f7325846"/>
+  <project name="people/tomgall/libjpeg-turbo/libjpeg-turbo" path="external/jpeg" remote="linaro-other" revision="0206f26bd4229243a87b3519d251f9e4947b6b2a"/>
+  <project name="platform/bionic" path="bionic" remote="linaro-android" revision="46e1d893c41c20e3d348fb64414b8294a3eebcb2"/>
+  <project name="platform/bootable/bootloader/legacy" path="bootable/bootloader/legacy" revision="d3271024770ddcc2fb87dd22f8280764545ab05a"/>
+  <project name="platform/bootable/diskinstaller" path="bootable/diskinstaller" revision="53bd9111b5ae1fc1180ec13755d9830f7cadacf5"/>
+  <project name="platform/bootable/recovery" path="bootable/recovery" revision="7172eb7b623f4b30f5a709d639fcd3fb51cd6220"/>
+  <project name="platform/build" path="build" remote="linaro-android" revision="edec05c8c7186bea4befcf95054548db3a0143f9">
+    <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-
-  <project path="kernel" name="people/andygreen/repo-branch-archive" revision="tilt-linaro-android-3.0" remote="linaro-other" />
-  <project path="u-boot" name="boot/u-boot-linaro-stable" revision="master" remote="linaro-other" />
-
-  <project path="packages/apps/0xbench" name="0xbench" revision="master" remote="0xbench" />
-  <project path="packages/apps/mmtest" name="people/bernhardrosenkranzer/mmtest" revision="master" remote="linaro-other" />
-  <project path="packages/apps/glmark2" name="people/afrantzis/glmark2" revision="master" remote="linaro-other" />
-
-  <project path="external/jpeg" name="people/tomgall/libjpeg-turbo/libjpeg-turbo" revision="1.2-beta-linaro-andoid" remote="linaro-other" />
-  <project path="external/dbus" name="platform/external/dbus" revision="linaro-master" remote="linaro-android" />
-  <project path="bionic" name="platform/bionic" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/fdlibm" name="platform/external/fdlibm" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/icu4c" name="platform/external/icu4c" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/iptables" name="platform/external/iptables" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_2.3.5" remote="linaro-android" />
-
-  <project path="hardware/libhardware" name="platform/hardware/libhardware" revision="linaro_android_2.3.5" remote="linaro-android" />
-
-  <!-- x-loader -->
-  <project path="device/linaro/x-loader" name="x-loader/x-loader" revision="master" remote="gitorious" />
-
-  <!-- proprietary-open - aka SGX et friends -->
-  <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="gingerbread" remote="linaro-android" />
-
-  <!-- TI's uim module for bt -->
-  <project path="device/ti/uim" name="device/ti/uim" revision="android" remote="linaro-android" />
-
-  <!-- standard Andorid manifest -->
-  <project path="bootable/bootloader/legacy" name="platform/bootable/bootloader/legacy" />
-  <project path="bootable/diskinstaller" name="platform/bootable/diskinstaller" />
-  <project path="bootable/recovery" name="platform/bootable/recovery" />
-  <project path="cts" name="platform/cts" />
-  <project path="development" name="platform/development" />
-  <project path="device/common" name="device/common" />
-  <project path="device/google/accessory/arduino" name="device/google/accessory/arduino" />
-  <project path="device/google/accessory/demokit" name="device/google/accessory/demokit" />
-  <project path="device/sample" name="device/sample" />
-  <project path="device/samsung/crespo" name="device/samsung/crespo" />
-  <project path="external/apache-http" name="platform/external/apache-http" />
-  <project path="external/astl" name="platform/external/astl" />
-  <project path="external/bison" name="platform/external/bison" />
-  <project path="external/blktrace" name="platform/external/blktrace" />
-  <project path="external/bluetooth/bluez" name="platform/external/bluetooth/bluez" />
-  <project path="external/bluetooth/glib" name="platform/external/bluetooth/glib" />
-  <project path="external/bluetooth/hcidump" name="platform/external/bluetooth/hcidump" />
-  <project path="external/bouncycastle" name="platform/external/bouncycastle" />
-  <project path="external/bsdiff" name="platform/external/bsdiff" />
-  <project path="external/bzip2" name="platform/external/bzip2" />
-  <project path="external/chromium" name="platform/external/chromium" />
-  <project path="external/clearsilver" name="platform/external/clearsilver" />
-  <project path="external/dhcpcd" name="platform/external/dhcpcd" />
-  <project path="external/dropbear" name="platform/external/dropbear" />
-  <project path="external/e2fsprogs" name="platform/external/e2fsprogs" />
-  <project path="external/easymock" name="platform/external/easymock" />
-  <project path="external/elfutils" name="platform/external/elfutils" />
-  <project path="external/embunit" name="platform/external/embunit" />
-  <project path="external/emma" name="platform/external/emma" />
-  <project path="external/esd" name="platform/external/esd" />
-  <project path="external/expat" name="platform/external/expat" />
-  <project path="external/freetype" name="platform/external/freetype" />
-  <project path="external/fsck_msdos" name="platform/external/fsck_msdos" />
-  <project path="external/genext2fs" name="platform/external/genext2fs" />
-  <project path="external/giflib" name="platform/external/giflib" />
-  <project path="external/grub" name="platform/external/grub" />
-  <project path="external/gtest" name="platform/external/gtest" />
-  <project path="external/guava" name="platform/external/guava" />
-  <project path="external/iproute2" name="platform/external/iproute2" />
-  <project path="external/ipsec-tools" name="platform/external/ipsec-tools" />
-  <project path="external/jdiff" name="platform/external/jdiff" />
-  <project path="external/jhead" name="platform/external/jhead" />
-  <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/libgsm" name="platform/external/libgsm" />
-  <project path="external/libnfc-nxp" name="platform/external/libnfc-nxp" />
-  <project path="external/libpcap" name="platform/external/libpcap" />
-  <project path="external/libpng" name="platform/external/libpng" />
-  <project path="external/libxml2" name="platform/external/libxml2" />
-  <project path="external/mtpd" name="platform/external/mtpd" />
-  <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/nist-sip" name="platform/external/nist-sip" />
-  <project path="external/oauth" name="platform/external/oauth" />
-  <project path="external/openssl" name="platform/external/openssl" />
-  <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/protobuf" name="platform/external/protobuf" />
-  <project path="external/qemu" name="platform/external/qemu" />
-  <project path="external/quake" name="platform/external/quake" />
-  <project path="external/safe-iop" name="platform/external/safe-iop" />
-  <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/strace" name="platform/external/strace" />
-  <project path="external/tagsoup" name="platform/external/tagsoup" />
-  <project path="external/tinyxml" name="platform/external/tinyxml" />
-  <project path="external/tremolo" name="platform/external/tremolo" />
-  <project path="external/v8" name="platform/external/v8" />
-  <project path="external/wpa_supplicant" name="platform/external/wpa_supplicant" />
-  <project path="external/xmlwriter" name="platform/external/xmlwriter" />
-  <project path="external/yaffs2" name="platform/external/yaffs2" />
-  <project path="external/zlib" name="platform/external/zlib" />
-  <project path="frameworks/ex" name="platform/frameworks/ex" />
-  <project path="hardware/ril" name="platform/hardware/ril" />
-  <project path="ndk" name="platform/ndk" />
-  <project path="packages/apps/AccountsAndSyncSettings" name="platform/packages/apps/AccountsAndSyncSettings" />
-  <project path="packages/apps/Bluetooth" name="platform/packages/apps/Bluetooth" />
-  <project path="packages/apps/Browser" name="platform/packages/apps/Browser" />
-  <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="platform/packages/apps/Camera" />
-  <project path="packages/apps/CellBroadcastReceiver" name="platform/packages/apps/CellBroadcastReceiver" />
-  <project path="packages/apps/CertInstaller" name="platform/packages/apps/CertInstaller" />
-  <project path="packages/apps/Contacts" name="platform/packages/apps/Contacts" />
-  <project path="packages/apps/DeskClock" name="platform/packages/apps/DeskClock" />
-  <project path="packages/apps/Email" name="platform/packages/apps/Email" />
-  <project path="packages/apps/Gallery" name="platform/packages/apps/Gallery" />
-  <project path="packages/apps/Gallery3D" name="platform/packages/apps/Gallery3D" />
-  <project path="packages/apps/HTMLViewer" name="platform/packages/apps/HTMLViewer" />
-  <project path="packages/apps/Launcher2" name="platform/packages/apps/Launcher2" />
-  <project path="packages/apps/Mms" name="platform/packages/apps/Mms" />
-  <project path="packages/apps/Music" name="platform/packages/apps/Music" />
-  <project path="packages/apps/Nfc" name="platform/packages/apps/Nfc" />
-  <project path="packages/apps/PackageInstaller" name="platform/packages/apps/PackageInstaller" />
-  <project path="packages/apps/Phone" name="platform/packages/apps/Phone" />
-  <project path="packages/apps/Protips" name="platform/packages/apps/Protips" />
-  <project path="packages/apps/QuickSearchBox" name="platform/packages/apps/QuickSearchBox" />
-  <project path="packages/apps/SmartCardService" name="platform/packages/apps/SmartCardService" />
-  <project path="packages/apps/SoundRecorder" name="platform/packages/apps/SoundRecorder" />
-  <project path="packages/apps/SpeechRecorder" name="platform/packages/apps/SpeechRecorder" />
-  <project path="packages/apps/Stk" name="platform/packages/apps/Stk" />
-  <project path="packages/apps/Tag" name="platform/packages/apps/Tag" />
-  <project path="packages/apps/VoiceDialer" name="platform/packages/apps/VoiceDialer" />
-  <project path="packages/experimental" name="platform/packages/experimental" />
-  <project path="packages/inputmethods/LatinIME" name="platform/packages/inputmethods/LatinIME" />
-  <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="platform/packages/providers/DownloadProvider" />
-  <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="platform/packages/providers/MediaProvider" />
-  <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="platform/packages/wallpapers/Basic" />
-  <project path="packages/wallpapers/LivePicker" name="platform/packages/wallpapers/LivePicker" />
-  <project path="packages/wallpapers/MagicSmoke" name="platform/packages/wallpapers/MagicSmoke" />
-  <project path="packages/wallpapers/MusicVisualization" name="platform/packages/wallpapers/MusicVisualization" />
-  <project path="prebuilt" name="platform/prebuilt" />
-  <project path="sdk" name="platform/sdk" />
-  <project path="system/bluetooth" name="platform/system/bluetooth" />
-  <project path="system/extras" name="platform/system/extras" />
-  <project path="system/netd" name="platform/system/netd" />
-
+  <project name="platform/cts" path="cts" revision="6b4d831147bd65bc5a3d3e23c05626c831151615"/>
+  <project name="platform/dalvik" path="dalvik" remote="linaro-android" revision="87dc8dd69f81bb07007969dee9e71bce7fa82807"/>
+  <project name="platform/development" path="development" revision="f60f95391262f2295b9173e23a9344c8322d604a"/>
+  <project name="platform/external/apache-http" path="external/apache-http" revision="b91c5e936342afbdd58c88ac604d5dd505d0fe0c"/>
+  <project name="platform/external/astl" path="external/astl" revision="c3c760978c34d5eeea1205c0bf7f27444e192a98"/>
+  <project name="platform/external/bison" path="external/bison" revision="889df9c1efa7ca5de113407ab7793b57a6db677d"/>
+  <project name="platform/external/blktrace" path="external/blktrace" revision="ac4461c3b3e7bcbafe5336b9478657d0fa3e08aa"/>
+  <project name="platform/external/bluetooth/bluez" path="external/bluetooth/bluez" revision="02e98694ef87ea8ecb47789abf89c3f945ee0e20"/>
+  <project name="platform/external/bluetooth/glib" path="external/bluetooth/glib" revision="0c01eb3a7313a580fe34044bcdc3337d067c8a15"/>
+  <project name="platform/external/bluetooth/hcidump" path="external/bluetooth/hcidump" revision="ce36a6c7c5f8043c038415d8e270d55d9834008d"/>
+  <project name="platform/external/bouncycastle" path="external/bouncycastle" revision="3ab12958718f17e48e2816a84d403f6305cc2800"/>
+  <project name="platform/external/bsdiff" path="external/bsdiff" revision="df980d633fd0bdc0b89af26630f543d91bb87e68"/>
+  <project name="platform/external/busybox" path="external/busybox" remote="linaro-android" revision="496c5fca645e6b724b162e66931e446a85fc49d3"/>
+  <project name="platform/external/bzip2" path="external/bzip2" revision="879585bbef51b4cabaac6340a95d807dca379cdc"/>
+  <project name="platform/external/chromium" path="external/chromium" revision="5e43ad9465e402d595a3c960784b1effe2e9bd88"/>
+  <project name="platform/external/clearsilver" path="external/clearsilver" revision="3e15867df7fb41770c090ee40411a6c376574ae3"/>
+  <project name="platform/external/dbus" path="external/dbus" remote="linaro-android" revision="97b3dae199a09f003fd60fe63f1b17ec0fa5fb76"/>
+  <project name="platform/external/dhcpcd" path="external/dhcpcd" revision="17fdc0dee1db0246a59cd3b28278389043fe5134"/>
+  <project name="platform/external/dnsmasq" path="external/dnsmasq" remote="linaro-android" revision="ebf5da42ba598621e9dbb878196254e83c91d8fc"/>
+  <project name="platform/external/dropbear" path="external/dropbear" revision="d3a3a803df8f32e9ba26758b3a9d7fbd27a3dc9c"/>
+  <project name="platform/external/e2fsprogs" path="external/e2fsprogs" revision="6641b4da8001b46fd17e723a572459db0325e023"/>
+  <project name="platform/external/easymock" path="external/easymock" revision="17d5eb4006c438775d8eaa7600e947e4ac090a18"/>
+  <project name="platform/external/elfcopy" path="external/elfcopy" remote="linaro-android" revision="0513f4c3119ad2ca0b302eedefc58cc7f470d6de"/>
+  <project name="platform/external/elfutils" path="external/elfutils" revision="84cf4183ba6f577ee01abe7f1f5a6d4b23df35a8"/>
+  <project name="platform/external/embunit" path="external/embunit" revision="f5eb8b0c9abf1e9911b5c84a555bc495651595e5"/>
+  <project name="platform/external/emma" path="external/emma" revision="4d37e21b7c2fa378dbf7cfe2ea57d7f5991fe6cd"/>
+  <project name="platform/external/esd" path="external/esd" revision="224a67f2683a7ee997179fc5dd16115e39987b0f"/>
+  <project name="platform/external/expat" path="external/expat" revision="204e2ef0e1a2c2da0087cccb0c9b618d52f1d584"/>
+  <project name="platform/external/fdlibm" path="external/fdlibm" remote="linaro-android" revision="a74d3139b5e2046e52a94f6b1510d5e3d15c2bc1"/>
+  <project name="platform/external/ffmpeg" path="external/ffmpeg" remote="linaro-android" revision="6d020211c1fb464b956c203e6cc5a0e157d1eb13"/>
+  <project name="platform/external/freetype" path="external/freetype" revision="aacb8e1368a883fcbc9fe64fd0e460cef9c9b20c"/>
+  <project name="platform/external/fsck_msdos" path="external/fsck_msdos" revision="b6ee08aadb580341a4d80943741b80de16a88b5d"/>
+  <project name="platform/external/genext2fs" path="external/genext2fs" revision="28f10892a39db10b1c65125723d9737de865ef56"/>
+  <project name="platform/external/giflib" path="external/giflib" revision="b2597268aef084202a8c349d1cc072c03c6e22eb"/>
+  <project name="platform/external/grub" path="external/grub" revision="a0be411871f2e71834a2cd75dea882d732557530"/>
+  <project name="platform/external/gtest" path="external/gtest" revision="75f109c3120bf78ee89124f1f21b50ea24225236"/>
+  <project name="platform/external/guava" path="external/guava" revision="5fa17bce47c47d5538beaaef0e38f0576446709c"/>
+  <project name="platform/external/icu4c" path="external/icu4c" remote="linaro-android" revision="0fd910cf8e8f3681d7a727f09273ce76dbfe4ec9"/>
+  <project name="platform/external/iproute2" path="external/iproute2" revision="14740a4557728ba63348e0574507a71fa40a8bd4"/>
+  <project name="platform/external/ipsec-tools" path="external/ipsec-tools" revision="f5d0d0919f6c0b82611c1f8ad0cb6023a78b6ce0"/>
+  <project name="platform/external/iptables" path="external/iptables" remote="linaro-android" revision="4ebfa4c82fc82e25e1206a9197809062d5d4f306"/>
+  <project name="platform/external/jdiff" path="external/jdiff" revision="590cef7c1b48c9c3f4556ae65fbc0065d65da54a"/>
+  <project name="platform/external/jhead" path="external/jhead" revision="fd983181d9043cdf45497ace19c60fd9e4e1799c"/>
+  <project name="platform/external/jsr305" path="external/jsr305" revision="8e937939899d5fe3a6864c7ecb9bb8632678a7c7"/>
+  <project name="platform/external/junit" path="external/junit" revision="e9b8080d6d80d17729e0b7f8b1d2b573b3456cc4"/>
+  <project name="platform/external/kernel-headers" path="external/kernel-headers" revision="8abdcd4098f266e438e7129a3dfe311005686431"/>
+  <project name="platform/external/libffi" path="external/libffi" revision="5dea54fd57265ce037ac94055b9f94a45558b39e"/>
+  <project name="platform/external/libgsm" path="external/libgsm" revision="5e4516958690b9a1b2c98f88eeecba3edd2dbda4"/>
+  <project name="platform/external/libnfc-nxp" path="external/libnfc-nxp" revision="178bcc31188d60d13e7455c14e9fd902f5505331"/>
+  <project name="platform/external/libnl" path="external/libnl" remote="linaro-android" revision="bbcb553f0f4636dd40e84d320a576b3de7b95357"/>
+  <project name="platform/external/libpcap" path="external/libpcap" revision="3a7bce5dda6a8db92c9248846d0255e68c3a5b2a"/>
+  <project name="platform/external/libpng" path="external/libpng" revision="4ce0ee15f268e0161438b4133936cb2826f7fd50"/>
+  <project name="platform/external/libvpx" path="external/libvpx" remote="linaro-android" revision="62644e5902d0ea9de45ed57442587020a21115e7"/>
+  <project name="platform/external/libxml2" path="external/libxml2" revision="f16b5fdc2102953f6b915472200061e17e76702b"/>
+  <project name="platform/external/mtpd" path="external/mtpd" revision="fccbc17685cd8bd43cf1c1e533c4d02f6f79d667"/>
+  <project name="platform/external/ncurses" path="external/ncurses" remote="linaro-android" revision="5fc466743430377a29b0dc6a38b0d1de843581e7"/>
+  <project name="platform/external/netcat" path="external/netcat" revision="fc2dc55c510657073ef4235658167a878e82cefa"/>
+  <project name="platform/external/netperf" path="external/netperf" revision="58ecd3b7c76263900e38921360e334a416aec362"/>
+  <project name="platform/external/neven" path="external/neven" revision="7164d6ac08ab9fc1247aa29f1dafd0ef7808f0f2"/>
+  <project name="platform/external/nist-sip" path="external/nist-sip" revision="a58e4068f86c6ca3f9771d4ec8b2665d070a170e"/>
+  <project name="platform/external/oauth" path="external/oauth" revision="c76276a1d6165cfb502b06f65b1735fef0754d26"/>
+  <project name="platform/external/openssl" path="external/openssl" revision="f07bf9fa6a96c0039e832242569c8e6fc40c9a94"/>
+  <project name="platform/external/oprofile" path="external/oprofile" revision="041ee6ccda354960ebc1e1ccfff78685ec5326e1"/>
+  <project name="platform/external/ping" path="external/ping" revision="f35ea57ab6d01badde92491274ff2d74cbe3cf01"/>
+  <project name="platform/external/powertop" path="external/powertop" remote="linaro-android" revision="3d1c205aabb9a0451c6b3fe7846e8cce5521c727"/>
+  <project name="platform/external/ppp" path="external/ppp" revision="d88bff8f5384285f76576eb7707c6d9d5b98edb6"/>
+  <project name="platform/external/proguard" path="external/proguard" revision="6660cb6cb4231a03a3c02127fa5c4e7828422caa"/>
+  <project name="platform/external/protobuf" path="external/protobuf" revision="3574de1ca8301e1e13d1c89f2e2a902499d6bae9"/>
+  <project name="platform/external/qemu" path="external/qemu" revision="2fa5173bd1ce7341c50adac676a317945f0969c7"/>
+  <project name="platform/external/quake" path="external/quake" revision="9b0abf864353d47404417c1cbd8384e15be547b0"/>
+  <project name="platform/external/safe-iop" path="external/safe-iop" revision="07073634e2e3aa4f518e36ed5dec3aabc549d5fb"/>
+  <project name="platform/external/skia" path="external/skia" remote="linaro-android" revision="b17b930777b5c84e9a8048147577646a58a6a0fc"/>
+  <project name="platform/external/sonivox" path="external/sonivox" revision="d029b2378170cfd7bb34d894482065a762a54578"/>
+  <project name="platform/external/speex" path="external/speex" revision="32e4d0aa78c5879565cbcd06415fa2e344036ab5"/>
+  <project name="platform/external/sqlite" path="external/sqlite" revision="90f23688416d9f4e1e5d0128dca5f26404b6898e"/>
+  <project name="platform/external/srec" path="external/srec" revision="7390035ea61b32477243d60c452664150b61f023"/>
+  <project name="platform/external/stlport" path="external/stlport" remote="linaro-android" revision="f56d1f0242e7eb2800f552e3c3c562b02c26b2b2"/>
+  <project name="platform/external/strace" path="external/strace" revision="cfa96b379cdd6561a5cc89f2bb86ee9f4b2a3928"/>
+  <project name="platform/external/svox" path="external/svox" remote="linaro-android" revision="c54cda009637d7be08e4cd5b829ec0fc3079f60f"/>
+  <project name="platform/external/tagsoup" path="external/tagsoup" revision="68c2ec9e0acdb3214b7fb91dbab8c9fab8736817"/>
+  <project name="platform/external/tcpdump" path="external/tcpdump" remote="linaro-android" revision="616015d52648c7eb6460eb6411aa87581cbb0e13"/>
+  <project name="platform/external/tinyxml" path="external/tinyxml" revision="d589f7e4a51e75bd5c98a3defd8ee84d7059e86e"/>
+  <project name="platform/external/tremolo" path="external/tremolo" revision="9a688754461ebfc91769b5d3c8ba5aba9fe1f376"/>
+  <project name="platform/external/v8" path="external/v8" revision="6599b9dd3411791c9d89ab7efbfb4131e5664c48"/>
+  <project name="platform/external/webkit" path="external/webkit" remote="linaro-android" revision="1e02484fcaef9e1ea900b6e3323b8907c79b4bb2"/>
+  <project name="platform/external/wpa_supplicant" path="external/wpa_supplicant" revision="2b7ee495307e9fd349a0f37ec560834adbc954cc"/>
+  <project name="platform/external/wpa_supplicant_6" path="external/wpa_supplicant_6" remote="linaro-android" revision="981fc47b45bd7d97ea56dac8f33cc95cc4c71e6b"/>
+  <project name="platform/external/x264" path="external/x264" remote="linaro-android" revision="c8be2223e23a49c852557881d8210a70aae9cb5c"/>
+  <project name="platform/external/xmlwriter" path="external/xmlwriter" revision="e95d92246ee35273dde2bee8b00485cc14c12be5"/>
+  <project name="platform/external/yaffs2" path="external/yaffs2" revision="0fe811d9a994dd6df8aa9852c7b9241fa9aa453b"/>
+  <project name="platform/external/zlib" path="external/zlib" revision="96c70b1df1629d7f0eb8f666045bfd5eb062cebf"/>
+  <project name="platform/frameworks/base" path="frameworks/base" remote="linaro-android" revision="a08dc19c13967d6efa54443c21918288d5fb4178"/>
+  <project name="platform/frameworks/ex" path="frameworks/ex" revision="e0d5045a56146f0e7d8ea9e400f6eb209edceec5"/>
+  <project name="platform/frameworks/opt/emoji" path="frameworks/opt/emoji" remote="linaro-android" revision="941fb3d38928a8483701fe2be45ccbc6579f3633"/>
+  <project name="platform/hardware/libhardware" path="hardware/libhardware" remote="linaro-android" revision="f50b075a8b88eff482628e8ab62a04539117c7ea"/>
+  <project name="platform/hardware/libhardware_legacy" path="hardware/libhardware_legacy" remote="linaro-android" revision="65a03e4ba7f8981a1c8f0849a8af6c31c2825a41"/>
+  <project name="platform/hardware/ril" path="hardware/ril" revision="3b1530aef62476248825a2092c9aea800395c3b1"/>
+  <project name="platform/libcore" path="libcore" remote="linaro-android" revision="b390cef44c168f9a6cfa8b70cc7861869ab3be5d"/>
+  <project name="platform/ndk" path="ndk" revision="7a619be40e8594a961066a33b7cc9ef52f566988"/>
+  <project name="platform/packages/apps/AccountsAndSyncSettings" path="packages/apps/AccountsAndSyncSettings" revision="0179779e69d0a8ce2879cf27261af9bc2908cae0"/>
+  <project name="platform/packages/apps/Bluetooth" path="packages/apps/Bluetooth" revision="6d48feaaff63b14adc23e7b2d82854189a456f15"/>
+  <project name="platform/packages/apps/Browser" path="packages/apps/Browser" revision="7b6955578d914557eea7ff3cbcec70e953970092"/>
+  <project name="platform/packages/apps/Calculator" path="packages/apps/Calculator" revision="5c85e48a713ec70ebce65ebf1a3622035992f8c3"/>
+  <project name="platform/packages/apps/Calendar" path="packages/apps/Calendar" revision="ee794988e54a2e8172b1482d108924934c0f70cb"/>
+  <project name="platform/packages/apps/Camera" path="packages/apps/Camera" revision="8ff2adc739ca898d0230c702eed7d327e5bbf4dc"/>
+  <project name="platform/packages/apps/CellBroadcastReceiver" path="packages/apps/CellBroadcastReceiver" revision="50a624a47ce645a7992e346e40a4e7ec5e0df9b7"/>
+  <project name="platform/packages/apps/CertInstaller" path="packages/apps/CertInstaller" revision="457ffda6726b8e0f88d78a9267b840d102a8907a"/>
+  <project name="platform/packages/apps/Contacts" path="packages/apps/Contacts" revision="ec0e540fb20a31f77ca561bc4a872e817195627a"/>
+  <project name="platform/packages/apps/DeskClock" path="packages/apps/DeskClock" revision="8e1921f8140f205c115582e4a068c7ba5e79ff9c"/>
+  <project name="platform/packages/apps/Email" path="packages/apps/Email" revision="8c23a70b9123b77511e3ed9bbe827fe0c26bb674"/>
+  <project name="platform/packages/apps/Gallery" path="packages/apps/Gallery" revision="ea32625b6296585a0328886c33159d88e3a2c693"/>
+  <project name="platform/packages/apps/Gallery3D" path="packages/apps/Gallery3D" revision="87a545419820bc665d8fdb13845b65cf9707a7d8"/>
+  <project name="platform/packages/apps/HTMLViewer" path="packages/apps/HTMLViewer" revision="f470146b74d34c21e4d3526574e2bbd0e72a57f0"/>
+  <project name="platform/packages/apps/Launcher2" path="packages/apps/Launcher2" revision="3fd010a6fe457a59d2e983a348e63dc25e836852"/>
+  <project name="platform/packages/apps/Mms" path="packages/apps/Mms" revision="fd1766e6613390ac9d7c0dd8feac8708fa023a2b"/>
+  <project name="platform/packages/apps/Music" path="packages/apps/Music" revision="278aaed1eb37763f7dcb2364523db591014a9210"/>
+  <project name="platform/packages/apps/Nfc" path="packages/apps/Nfc" revision="e4d9ddebb676325c6abfe3b0d4c0aefa8a17d952"/>
+  <project name="platform/packages/apps/PackageInstaller" path="packages/apps/PackageInstaller" revision="6d2974c3f346511f96eba3370398123422e578fc"/>
+  <project name="platform/packages/apps/Phone" path="packages/apps/Phone" revision="54c42aebae50804cb620a35f0f82dd2ce2187e53"/>
+  <project name="platform/packages/apps/Protips" path="packages/apps/Protips" revision="a853d2b914144dd1f2ff3f03170f67d74338815d"/>
+  <project name="platform/packages/apps/QuickSearchBox" path="packages/apps/QuickSearchBox" revision="e8b28b6f1cab74060ea3101b1eee1dfdb32c89e9"/>
+  <project name="platform/packages/apps/Settings" path="packages/apps/Settings" remote="linaro-android" revision="ee25812a8eda802cc144dc416f2dca88d421bcef"/>
+  <project name="platform/packages/apps/SmartCardService" path="packages/apps/SmartCardService" revision="29eae320a4bd222b5ff1c092f84f1aebba88d0b7"/>
+  <project name="platform/packages/apps/SoundRecorder" path="packages/apps/SoundRecorder" revision="20b07a73ec046d23f5cfabaf60d54feb868a5eea"/>
+  <project name="platform/packages/apps/SpeechRecorder" path="packages/apps/SpeechRecorder" revision="f075eb5cefb6357aa7562a6d156bda5383ac087d"/>
+  <project name="platform/packages/apps/Stk" path="packages/apps/Stk" revision="d2f267c7ed48dc77878299e12925bc3c39db5d37"/>
+  <project name="platform/packages/apps/Tag" path="packages/apps/Tag" revision="4b1e01421a564b348fcf7c0203dcb89576883aff"/>
+  <project name="platform/packages/apps/VoiceDialer" path="packages/apps/VoiceDialer" revision="13b6acf2174e8dc23f70def279c85d191c3fcbc1"/>
+  <project name="platform/packages/experimental" path="packages/experimental" revision="504fe3ddddf722e4315b382319970b0e435af27b"/>
+  <project name="platform/packages/inputmethods/LatinIME" path="packages/inputmethods/LatinIME" revision="ec622ced359cfe646efc14b68e25539fa7a438d9"/>
+  <project name="platform/packages/inputmethods/OpenWnn" path="packages/inputmethods/OpenWnn" revision="27ab9d1b806f03554d2abb50de26abe7bf234336"/>
+  <project name="platform/packages/inputmethods/PinyinIME" path="packages/inputmethods/PinyinIME" revision="6b7954e2967754a77c55dc4291941978e3508259"/>
+  <project name="platform/packages/providers/ApplicationsProvider" path="packages/providers/ApplicationsProvider" revision="0234d298ecdffe3a10877d6edffe98e299713caa"/>
+  <project name="platform/packages/providers/CalendarProvider" path="packages/providers/CalendarProvider" revision="959739d351af5d04e8c92f6b031f737348d4b139"/>
+  <project name="platform/packages/providers/ContactsProvider" path="packages/providers/ContactsProvider" revision="c9d8e21bd1e6dbde3208b9475a2697081f8ced79"/>
+  <project name="platform/packages/providers/DownloadProvider" path="packages/providers/DownloadProvider" revision="abb94fb35445de2eadd1804ad2f4023bd50a6b5c"/>
+  <project name="platform/packages/providers/DrmProvider" path="packages/providers/DrmProvider" revision="42f3f2cbfecbbca1d18a5ff91e12619eba740516"/>
+  <project name="platform/packages/providers/GoogleContactsProvider" path="packages/providers/GoogleContactsProvider" revision="4886c7a0cfba5df74b213b1fc8286c6e3f2ddaa2"/>
+  <project name="platform/packages/providers/MediaProvider" path="packages/providers/MediaProvider" revision="2b0e56b7595da308d61d190b529518cdefc98acd"/>
+  <project name="platform/packages/providers/TelephonyProvider" path="packages/providers/TelephonyProvider" revision="6a5c080b90613c5afef04d453ab1498d22aee0a9"/>
+  <project name="platform/packages/providers/UserDictionaryProvider" path="packages/providers/UserDictionaryProvider" revision="d7eb9d4b59640175877a6f53f32b6e3e3d7154e9"/>
+  <project name="platform/packages/wallpapers/Basic" path="packages/wallpapers/Basic" revision="17db0721c8ef2d4f2c6835afaa3c47464730d9b1"/>
+  <project name="platform/packages/wallpapers/LivePicker" path="packages/wallpapers/LivePicker" revision="c114657db62c84b3b10c4e7d879d90ca5fc81d20"/>
+  <project name="platform/packages/wallpapers/MagicSmoke" path="packages/wallpapers/MagicSmoke" revision="4cb26a827ca03cad77522862cc78248e052ea0ca"/>
+  <project name="platform/packages/wallpapers/MusicVisualization" path="packages/wallpapers/MusicVisualization" revision="6759a52f863f60a67941938bd8d4610b01f9d2aa"/>
+  <project name="platform/prebuilt" path="prebuilt" revision="6b399f3609ac871310e9e51ff76393be605c6088"/>
+  <project name="platform/sdk" path="sdk" revision="dee444f860076b07d4b751fa64aba6683b4c377d"/>
+  <project name="platform/system/bluetooth" path="system/bluetooth" revision="7dc550597f490a67c8d020c727bfbf2d9d212d42"/>
+  <project name="platform/system/core" path="system/core" remote="linaro-android" revision="474bcaf1cbf12ff9007181a8093d2c12bc49d5b1"/>
+  <project name="platform/system/extras" path="system/extras" revision="8bdbbe2de23a8a8fc26b7f3a4b7dfdbe1112ac9f"/>
+  <project name="platform/system/media" path="system/media" remote="linaro-android" revision="bb5a707fe803083070c0d7ce475a0b898a522c22"/>
+  <project name="platform/system/netd" path="system/netd" revision="4415a6992691845c86bbb7b8ac9bd4c620338daa"/>
+  <project name="platform/system/vold" path="system/vold" remote="linaro-android" revision="119e194d52621f51892a0c7397f11637c0a5ec69"/>
+  <project name="x-loader/x-loader" path="device/linaro/x-loader" remote="gitorious" revision="c4289f1bee035dea41536c5ba5e1bc36c7d493c4"/>
 </manifest>
diff --git a/staging-snowball.xml b/staging-snowball.xml
index f7fbca21b..92cde7f4f 100644
--- a/staging-snowball.xml
+++ b/staging-snowball.xml
@@ -1,218 +1,190 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
-  <remote  name="korg"
-           fetch="git://android.git.linaro.org/"
-           review="review.android.git.linaro.org" />
-  <default revision="refs/tags/android-2.3.5_r1"
-           remote="korg" />
-
-  <remote  name="linaro-android"
-           fetch="git://android.git.linaro.org/"
-           review="review.android.git.linaro.org" />
-
-  <remote  name="linaro-other"
-           fetch="git://git.linaro.org/" />
-
-  <remote  name="0xbench"
-           fetch="git://gitorious.org/0xbench/" />
-
-  <remote  name="gitorious"
-           fetch="git://gitorious.org/" />
-
-  <remote  name="igloocommunity"
-           fetch="git://igloocommunity.org/" />
-
-  <!-- Linaro changes -->
-  <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_2.3.5" remote="linaro-android" />
-
-  <project path="device/linaro/beagleboard" name="device/linaro/beagleboard" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="device/linaro/pandaboard" name="device/linaro/pandaboard" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="device/linaro/u8500href" name="device/linaro/u8500href" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="device/linaro/snowball" name="device/linaro/snowball" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="device/linaro/common" name="device/linaro/common" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="system/vold" name="platform/system/vold" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="system/core" name="platform/system/core" revision="linaro_android_2.3.5" remote="linaro-android" />
-
-  <project path="dalvik" name="platform/dalvik" revision="linaro_android_2.3.5" remote="linaro-android"/>
-  <project path="external/elfcopy" name="platform/external/elfcopy" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/skia" name="platform/external/skia" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="frameworks/opt/emoji" name="platform/frameworks/opt/emoji" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="libcore" name="platform/libcore" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="system/media" name="platform/system/media" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/svox" name="platform/external/svox" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/busybox" name="platform/external/busybox" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="hardware/libhardware" name="platform/hardware/libhardware" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project name="people/kwerner/libunwind" path="external/libunwind" remote="linaro-other" revision="fc05b927bc13c00d38a540f603f4fcb4f7325846" />
-
-  <!-- Multimedia extensions -->
-  <project path="external/libvpx" name="platform/external/libvpx" revision="linaro-master" remote="linaro-android" />
-  <project path="external/x264" name="platform/external/x264" revision="linaro-master" remote="linaro-android" />
-  <project path="external/ffmpeg" name="platform/external/ffmpeg" revision="linaro-0.8" remote="linaro-android" />
-
-  <!-- Power WG -->
-  <project path="external/powertop" name="platform/external/powertop"  remote="linaro-android" revision="linaro" />
-  <project path="external/ncurses" name="platform/external/ncurses"  remote="linaro-android" revision="linaro" />
-  <project path="external/libnl" name="platform/external/libnl"  remote="linaro-android" revision="linaro" />
-
-  <project path="build" name="platform/build" revision="linaro_android_2.3.5" remote="linaro-android" >
-    <copyfile src="core/root.mk" dest="Makefile" />
+  <remote fetch="git://gitorious.org/0xbench/" name="0xbench"/>
+  <remote fetch="git://gitorious.org/" name="gitorious"/>
+  <remote fetch="git://igloocommunity.org/" name="igloocommunity"/>
+  <remote fetch="git://android.git.linaro.org/" name="korg" review="review.android.git.linaro.org"/>
+  <remote fetch="git://android.git.linaro.org/" name="linaro-android" review="review.android.git.linaro.org"/>
+  <remote fetch="git://git.linaro.org/" name="linaro-other"/>
+
+  <default remote="korg" revision="refs/tags/android-2.3.5_r1"/>
+
+  <project name="0xbench" path="packages/apps/0xbench" remote="0xbench" revision="1772a907e73e188317c60d5d9561551e5d9b6c5f"/>
+  <project name="device/common" revision="3b932551eb896cd1880e65b156059a5f34d2f655"/>
+  <project name="device/google/accessory/arduino" revision="ee3bb7c351e732e8f518cde0238bf9b3d810d80a"/>
+  <project name="device/google/accessory/demokit" revision="37921cd911a238cee5d79c6f63f84304c1ca36e0"/>
+  <project name="device/linaro/beagleboard" remote="linaro-android" revision="5029d2ca236dd840e9b2785ff4daeb7c9b627995"/>
+  <project name="device/linaro/common" remote="linaro-android" revision="1550de16d8bf3e80b333b73ee1dec7750fe552f8"/>
+  <project name="device/linaro/pandaboard" remote="linaro-android" revision="5dac14677e208091d28f540a38e98f8152e93b58"/>
+  <project name="device/linaro/snowball" remote="linaro-android" revision="1110f467b89da988c49079e8ddb769f27f327f87"/>
+  <project name="device/linaro/u8500href" remote="linaro-android" revision="b316efeb3147ee8e236db39192671595570b783b"/>
+  <project name="device/sample" revision="e04c7b12e187584785a038e586b8aeccc82b33d0"/>
+  <project name="device/samsung/crespo" revision="6a740e418e0a2a9beddc4f31ee6607e90d420b17"/>
+  <project name="git/boot/u-boot-ux500" path="u-boot" remote="igloocommunity" revision="0eb625e4f87a10e8850526a587287fc31b269110"/>
+  <project name="kernel/snowball" path="kernel" remote="linaro-android" revision="7118ded1c4dbdee31da6876b1839a1b647bc41df"/>
+  <project name="people/afrantzis/glmark2" path="packages/apps/glmark2" remote="linaro-other" revision="e3727c42da8cf7dd554df5d25c6ee249bad0a452"/>
+  <project name="people/bernhardrosenkranzer/mmtest" path="packages/apps/mmtest" remote="linaro-other" revision="7caaadf7a48c0322693f226d7a78b78f853d51c0"/>
+  <project name="people/kwerner/libunwind" path="external/libunwind" remote="linaro-other" revision="fc05b927bc13c00d38a540f603f4fcb4f7325846"/>
+  <project name="people/tomgall/libjpeg-turbo/libjpeg-turbo" path="external/jpeg" remote="linaro-other" revision="0206f26bd4229243a87b3519d251f9e4947b6b2a"/>
+  <project name="platform/bionic" path="bionic" remote="linaro-android" revision="46e1d893c41c20e3d348fb64414b8294a3eebcb2"/>
+  <project name="platform/bootable/bootloader/legacy" path="bootable/bootloader/legacy" revision="d3271024770ddcc2fb87dd22f8280764545ab05a"/>
+  <project name="platform/bootable/diskinstaller" path="bootable/diskinstaller" revision="53bd9111b5ae1fc1180ec13755d9830f7cadacf5"/>
+  <project name="platform/bootable/recovery" path="bootable/recovery" revision="7172eb7b623f4b30f5a709d639fcd3fb51cd6220"/>
+  <project name="platform/build" path="build" remote="linaro-android" revision="edec05c8c7186bea4befcf95054548db3a0143f9">
+    <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-
-  <project path="kernel" name="kernel/snowball" revision="master" remote="linaro-android" />
-  <project path="u-boot" name="git/boot/u-boot-ux500" revision="master" remote="igloocommunity" />
-
-  <project path="packages/apps/0xbench" name="0xbench" revision="master" remote="0xbench" />
-  <project path="packages/apps/mmtest" name="people/bernhardrosenkranzer/mmtest" revision="master" remote="linaro-other" />
-  <project path="packages/apps/glmark2" name="people/afrantzis/glmark2" revision="master" remote="linaro-other" />
-  <project path="external/jpeg" name="people/tomgall/libjpeg-turbo/libjpeg-turbo" revision="1.2-beta-linaro-andoid" remote="linaro-other" />
-  <project path="external/dbus" name="platform/external/dbus" revision="linaro-master" remote="linaro-android" />
-  <project path="bionic" name="platform/bionic" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/fdlibm" name="platform/external/fdlibm" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/icu4c" name="platform/external/icu4c" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/iptables" name="platform/external/iptables" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_2.3.5" remote="linaro-android" />
-
-  <!-- x-loader -->
-  <project path="device/linaro/x-loader" name="x-loader/x-loader" revision="master" remote="gitorious" />
-
-  <!-- standard Andorid manifest -->
-  <project path="bootable/bootloader/legacy" name="platform/bootable/bootloader/legacy" />
-  <project path="bootable/diskinstaller" name="platform/bootable/diskinstaller" />
-  <project path="bootable/recovery" name="platform/bootable/recovery" />
-  <project path="cts" name="platform/cts" />
-  <project path="development" name="platform/development" />
-  <project path="device/common" name="device/common" />
-  <project path="device/google/accessory/arduino" name="device/google/accessory/arduino" />
-  <project path="device/google/accessory/demokit" name="device/google/accessory/demokit" />
-  <project path="device/sample" name="device/sample" />
-  <project path="device/samsung/crespo" name="device/samsung/crespo" />
-  <project path="external/apache-http" name="platform/external/apache-http" />
-  <project path="external/astl" name="platform/external/astl" />
-  <project path="external/bison" name="platform/external/bison" />
-  <project path="external/blktrace" name="platform/external/blktrace" />
-  <project path="external/bluetooth/bluez" name="platform/external/bluetooth/bluez" />
-  <project path="external/bluetooth/glib" name="platform/external/bluetooth/glib" />
-  <project path="external/bluetooth/hcidump" name="platform/external/bluetooth/hcidump" />
-  <project path="external/bouncycastle" name="platform/external/bouncycastle" />
-  <project path="external/bsdiff" name="platform/external/bsdiff" />
-  <project path="external/bzip2" name="platform/external/bzip2" />
-  <project path="external/chromium" name="platform/external/chromium" />
-  <project path="external/clearsilver" name="platform/external/clearsilver" />
-  <project path="external/dhcpcd" name="platform/external/dhcpcd" />
-  <project path="external/dropbear" name="platform/external/dropbear" />
-  <project path="external/e2fsprogs" name="platform/external/e2fsprogs" />
-  <project path="external/easymock" name="platform/external/easymock" />
-  <project path="external/elfutils" name="platform/external/elfutils" />
-  <project path="external/embunit" name="platform/external/embunit" />
-  <project path="external/emma" name="platform/external/emma" />
-  <project path="external/esd" name="platform/external/esd" />
-  <project path="external/expat" name="platform/external/expat" />
-  <project path="external/freetype" name="platform/external/freetype" />
-  <project path="external/fsck_msdos" name="platform/external/fsck_msdos" />
-  <project path="external/genext2fs" name="platform/external/genext2fs" />
-  <project path="external/giflib" name="platform/external/giflib" />
-  <project path="external/grub" name="platform/external/grub" />
-  <project path="external/gtest" name="platform/external/gtest" />
-  <project path="external/guava" name="platform/external/guava" />
-  <project path="external/iproute2" name="platform/external/iproute2" />
-  <project path="external/ipsec-tools" name="platform/external/ipsec-tools" />
-  <project path="external/jdiff" name="platform/external/jdiff" />
-  <project path="external/jhead" name="platform/external/jhead" />
-  <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/libgsm" name="platform/external/libgsm" />
-  <project path="external/libnfc-nxp" name="platform/external/libnfc-nxp" />
-  <project path="external/libpcap" name="platform/external/libpcap" />
-  <project path="external/libpng" name="platform/external/libpng" />
-  <project path="external/libxml2" name="platform/external/libxml2" />
-  <project path="external/mtpd" name="platform/external/mtpd" />
-  <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/nist-sip" name="platform/external/nist-sip" />
-  <project path="external/oauth" name="platform/external/oauth" />
-  <project path="external/openssl" name="platform/external/openssl" />
-  <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/protobuf" name="platform/external/protobuf" />
-  <project path="external/qemu" name="platform/external/qemu" />
-  <project path="external/quake" name="platform/external/quake" />
-  <project path="external/safe-iop" name="platform/external/safe-iop" />
-  <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/strace" name="platform/external/strace" />
-  <project path="external/tagsoup" name="platform/external/tagsoup" />
-  <project path="external/tinyxml" name="platform/external/tinyxml" />
-  <project path="external/tremolo" name="platform/external/tremolo" />
-  <project path="external/v8" name="platform/external/v8" />
-  <project path="external/wpa_supplicant" name="platform/external/wpa_supplicant" />
-  <project path="external/wpa_supplicant_6" name="platform/external/wpa_supplicant_6" />
-  <project path="external/xmlwriter" name="platform/external/xmlwriter" />
-  <project path="external/yaffs2" name="platform/external/yaffs2" />
-  <project path="external/zlib" name="platform/external/zlib" />
-  <project path="frameworks/ex" name="platform/frameworks/ex" />
-  <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" />
-  <project path="hardware/ril" name="platform/hardware/ril" />
-  <project path="ndk" name="platform/ndk" />
-  <project path="packages/apps/AccountsAndSyncSettings" name="platform/packages/apps/AccountsAndSyncSettings" />
-  <project path="packages/apps/Bluetooth" name="platform/packages/apps/Bluetooth" />
-  <project path="packages/apps/Browser" name="platform/packages/apps/Browser" />
-  <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="platform/packages/apps/Camera" />
-  <project path="packages/apps/CellBroadcastReceiver" name="platform/packages/apps/CellBroadcastReceiver" />
-  <project path="packages/apps/CertInstaller" name="platform/packages/apps/CertInstaller" />
-  <project path="packages/apps/Contacts" name="platform/packages/apps/Contacts" />
-  <project path="packages/apps/DeskClock" name="platform/packages/apps/DeskClock" />
-  <project path="packages/apps/Email" name="platform/packages/apps/Email" />
-  <project path="packages/apps/Gallery" name="platform/packages/apps/Gallery" />
-  <project path="packages/apps/Gallery3D" name="platform/packages/apps/Gallery3D" />
-  <project path="packages/apps/HTMLViewer" name="platform/packages/apps/HTMLViewer" />
-  <project path="packages/apps/Launcher2" name="platform/packages/apps/Launcher2" />
-  <project path="packages/apps/Mms" name="platform/packages/apps/Mms" />
-  <project path="packages/apps/Music" name="platform/packages/apps/Music" />
-  <project path="packages/apps/Nfc" name="platform/packages/apps/Nfc" />
-  <project path="packages/apps/PackageInstaller" name="platform/packages/apps/PackageInstaller" />
-  <project path="packages/apps/Phone" name="platform/packages/apps/Phone" />
-  <project path="packages/apps/Protips" name="platform/packages/apps/Protips" />
-  <project path="packages/apps/QuickSearchBox" name="platform/packages/apps/QuickSearchBox" />
-  <project path="packages/apps/SmartCardService" name="platform/packages/apps/SmartCardService" />
-  <project path="packages/apps/SoundRecorder" name="platform/packages/apps/SoundRecorder" />
-  <project path="packages/apps/SpeechRecorder" name="platform/packages/apps/SpeechRecorder" />
-  <project path="packages/apps/Stk" name="platform/packages/apps/Stk" />
-  <project path="packages/apps/Tag" name="platform/packages/apps/Tag" />
-  <project path="packages/apps/VoiceDialer" name="platform/packages/apps/VoiceDialer" />
-  <project path="packages/experimental" name="platform/packages/experimental" />
-  <project path="packages/inputmethods/LatinIME" name="platform/packages/inputmethods/LatinIME" />
-  <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="platform/packages/providers/DownloadProvider" />
-  <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="platform/packages/providers/MediaProvider" />
-  <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="platform/packages/wallpapers/Basic" />
-  <project path="packages/wallpapers/LivePicker" name="platform/packages/wallpapers/LivePicker" />
-  <project path="packages/wallpapers/MagicSmoke" name="platform/packages/wallpapers/MagicSmoke" />
-  <project path="packages/wallpapers/MusicVisualization" name="platform/packages/wallpapers/MusicVisualization" />
-  <project path="prebuilt" name="platform/prebuilt" />
-  <project path="sdk" name="platform/sdk" />
-  <project path="system/bluetooth" name="platform/system/bluetooth" />
-  <project path="system/extras" name="platform/system/extras" />
-  <project path="system/netd" name="platform/system/netd" />
-
+  <project name="platform/cts" path="cts" revision="6b4d831147bd65bc5a3d3e23c05626c831151615"/>
+  <project name="platform/dalvik" path="dalvik" remote="linaro-android" revision="87dc8dd69f81bb07007969dee9e71bce7fa82807"/>
+  <project name="platform/development" path="development" revision="f60f95391262f2295b9173e23a9344c8322d604a"/>
+  <project name="platform/external/apache-http" path="external/apache-http" revision="b91c5e936342afbdd58c88ac604d5dd505d0fe0c"/>
+  <project name="platform/external/astl" path="external/astl" revision="c3c760978c34d5eeea1205c0bf7f27444e192a98"/>
+  <project name="platform/external/bison" path="external/bison" revision="889df9c1efa7ca5de113407ab7793b57a6db677d"/>
+  <project name="platform/external/blktrace" path="external/blktrace" revision="ac4461c3b3e7bcbafe5336b9478657d0fa3e08aa"/>
+  <project name="platform/external/bluetooth/bluez" path="external/bluetooth/bluez" revision="02e98694ef87ea8ecb47789abf89c3f945ee0e20"/>
+  <project name="platform/external/bluetooth/glib" path="external/bluetooth/glib" revision="0c01eb3a7313a580fe34044bcdc3337d067c8a15"/>
+  <project name="platform/external/bluetooth/hcidump" path="external/bluetooth/hcidump" revision="ce36a6c7c5f8043c038415d8e270d55d9834008d"/>
+  <project name="platform/external/bouncycastle" path="external/bouncycastle" revision="3ab12958718f17e48e2816a84d403f6305cc2800"/>
+  <project name="platform/external/bsdiff" path="external/bsdiff" revision="df980d633fd0bdc0b89af26630f543d91bb87e68"/>
+  <project name="platform/external/busybox" path="external/busybox" remote="linaro-android" revision="496c5fca645e6b724b162e66931e446a85fc49d3"/>
+  <project name="platform/external/bzip2" path="external/bzip2" revision="879585bbef51b4cabaac6340a95d807dca379cdc"/>
+  <project name="platform/external/chromium" path="external/chromium" revision="5e43ad9465e402d595a3c960784b1effe2e9bd88"/>
+  <project name="platform/external/clearsilver" path="external/clearsilver" revision="3e15867df7fb41770c090ee40411a6c376574ae3"/>
+  <project name="platform/external/dbus" path="external/dbus" remote="linaro-android" revision="97b3dae199a09f003fd60fe63f1b17ec0fa5fb76"/>
+  <project name="platform/external/dhcpcd" path="external/dhcpcd" revision="17fdc0dee1db0246a59cd3b28278389043fe5134"/>
+  <project name="platform/external/dnsmasq" path="external/dnsmasq" remote="linaro-android" revision="ebf5da42ba598621e9dbb878196254e83c91d8fc"/>
+  <project name="platform/external/dropbear" path="external/dropbear" revision="d3a3a803df8f32e9ba26758b3a9d7fbd27a3dc9c"/>
+  <project name="platform/external/e2fsprogs" path="external/e2fsprogs" revision="6641b4da8001b46fd17e723a572459db0325e023"/>
+  <project name="platform/external/easymock" path="external/easymock" revision="17d5eb4006c438775d8eaa7600e947e4ac090a18"/>
+  <project name="platform/external/elfcopy" path="external/elfcopy" remote="linaro-android" revision="0513f4c3119ad2ca0b302eedefc58cc7f470d6de"/>
+  <project name="platform/external/elfutils" path="external/elfutils" revision="84cf4183ba6f577ee01abe7f1f5a6d4b23df35a8"/>
+  <project name="platform/external/embunit" path="external/embunit" revision="f5eb8b0c9abf1e9911b5c84a555bc495651595e5"/>
+  <project name="platform/external/emma" path="external/emma" revision="4d37e21b7c2fa378dbf7cfe2ea57d7f5991fe6cd"/>
+  <project name="platform/external/esd" path="external/esd" revision="224a67f2683a7ee997179fc5dd16115e39987b0f"/>
+  <project name="platform/external/expat" path="external/expat" revision="204e2ef0e1a2c2da0087cccb0c9b618d52f1d584"/>
+  <project name="platform/external/fdlibm" path="external/fdlibm" remote="linaro-android" revision="a74d3139b5e2046e52a94f6b1510d5e3d15c2bc1"/>
+  <project name="platform/external/ffmpeg" path="external/ffmpeg" remote="linaro-android" revision="6d020211c1fb464b956c203e6cc5a0e157d1eb13"/>
+  <project name="platform/external/freetype" path="external/freetype" revision="aacb8e1368a883fcbc9fe64fd0e460cef9c9b20c"/>
+  <project name="platform/external/fsck_msdos" path="external/fsck_msdos" revision="b6ee08aadb580341a4d80943741b80de16a88b5d"/>
+  <project name="platform/external/genext2fs" path="external/genext2fs" revision="28f10892a39db10b1c65125723d9737de865ef56"/>
+  <project name="platform/external/giflib" path="external/giflib" revision="b2597268aef084202a8c349d1cc072c03c6e22eb"/>
+  <project name="platform/external/grub" path="external/grub" revision="a0be411871f2e71834a2cd75dea882d732557530"/>
+  <project name="platform/external/gtest" path="external/gtest" revision="75f109c3120bf78ee89124f1f21b50ea24225236"/>
+  <project name="platform/external/guava" path="external/guava" revision="5fa17bce47c47d5538beaaef0e38f0576446709c"/>
+  <project name="platform/external/icu4c" path="external/icu4c" remote="linaro-android" revision="0fd910cf8e8f3681d7a727f09273ce76dbfe4ec9"/>
+  <project name="platform/external/iproute2" path="external/iproute2" revision="14740a4557728ba63348e0574507a71fa40a8bd4"/>
+  <project name="platform/external/ipsec-tools" path="external/ipsec-tools" revision="f5d0d0919f6c0b82611c1f8ad0cb6023a78b6ce0"/>
+  <project name="platform/external/iptables" path="external/iptables" remote="linaro-android" revision="4ebfa4c82fc82e25e1206a9197809062d5d4f306"/>
+  <project name="platform/external/jdiff" path="external/jdiff" revision="590cef7c1b48c9c3f4556ae65fbc0065d65da54a"/>
+  <project name="platform/external/jhead" path="external/jhead" revision="fd983181d9043cdf45497ace19c60fd9e4e1799c"/>
+  <project name="platform/external/jsr305" path="external/jsr305" revision="8e937939899d5fe3a6864c7ecb9bb8632678a7c7"/>
+  <project name="platform/external/junit" path="external/junit" revision="e9b8080d6d80d17729e0b7f8b1d2b573b3456cc4"/>
+  <project name="platform/external/kernel-headers" path="external/kernel-headers" revision="8abdcd4098f266e438e7129a3dfe311005686431"/>
+  <project name="platform/external/libffi" path="external/libffi" revision="5dea54fd57265ce037ac94055b9f94a45558b39e"/>
+  <project name="platform/external/libgsm" path="external/libgsm" revision="5e4516958690b9a1b2c98f88eeecba3edd2dbda4"/>
+  <project name="platform/external/libnfc-nxp" path="external/libnfc-nxp" revision="178bcc31188d60d13e7455c14e9fd902f5505331"/>
+  <project name="platform/external/libnl" path="external/libnl" remote="linaro-android" revision="bbcb553f0f4636dd40e84d320a576b3de7b95357"/>
+  <project name="platform/external/libpcap" path="external/libpcap" revision="3a7bce5dda6a8db92c9248846d0255e68c3a5b2a"/>
+  <project name="platform/external/libpng" path="external/libpng" revision="4ce0ee15f268e0161438b4133936cb2826f7fd50"/>
+  <project name="platform/external/libvpx" path="external/libvpx" remote="linaro-android" revision="62644e5902d0ea9de45ed57442587020a21115e7"/>
+  <project name="platform/external/libxml2" path="external/libxml2" revision="f16b5fdc2102953f6b915472200061e17e76702b"/>
+  <project name="platform/external/mtpd" path="external/mtpd" revision="fccbc17685cd8bd43cf1c1e533c4d02f6f79d667"/>
+  <project name="platform/external/ncurses" path="external/ncurses" remote="linaro-android" revision="5fc466743430377a29b0dc6a38b0d1de843581e7"/>
+  <project name="platform/external/netcat" path="external/netcat" revision="fc2dc55c510657073ef4235658167a878e82cefa"/>
+  <project name="platform/external/netperf" path="external/netperf" revision="58ecd3b7c76263900e38921360e334a416aec362"/>
+  <project name="platform/external/neven" path="external/neven" revision="7164d6ac08ab9fc1247aa29f1dafd0ef7808f0f2"/>
+  <project name="platform/external/nist-sip" path="external/nist-sip" revision="a58e4068f86c6ca3f9771d4ec8b2665d070a170e"/>
+  <project name="platform/external/oauth" path="external/oauth" revision="c76276a1d6165cfb502b06f65b1735fef0754d26"/>
+  <project name="platform/external/openssl" path="external/openssl" revision="f07bf9fa6a96c0039e832242569c8e6fc40c9a94"/>
+  <project name="platform/external/oprofile" path="external/oprofile" revision="041ee6ccda354960ebc1e1ccfff78685ec5326e1"/>
+  <project name="platform/external/ping" path="external/ping" revision="f35ea57ab6d01badde92491274ff2d74cbe3cf01"/>
+  <project name="platform/external/powertop" path="external/powertop" remote="linaro-android" revision="3d1c205aabb9a0451c6b3fe7846e8cce5521c727"/>
+  <project name="platform/external/ppp" path="external/ppp" revision="d88bff8f5384285f76576eb7707c6d9d5b98edb6"/>
+  <project name="platform/external/proguard" path="external/proguard" revision="6660cb6cb4231a03a3c02127fa5c4e7828422caa"/>
+  <project name="platform/external/protobuf" path="external/protobuf" revision="3574de1ca8301e1e13d1c89f2e2a902499d6bae9"/>
+  <project name="platform/external/qemu" path="external/qemu" revision="2fa5173bd1ce7341c50adac676a317945f0969c7"/>
+  <project name="platform/external/quake" path="external/quake" revision="9b0abf864353d47404417c1cbd8384e15be547b0"/>
+  <project name="platform/external/safe-iop" path="external/safe-iop" revision="07073634e2e3aa4f518e36ed5dec3aabc549d5fb"/>
+  <project name="platform/external/skia" path="external/skia" remote="linaro-android" revision="b17b930777b5c84e9a8048147577646a58a6a0fc"/>
+  <project name="platform/external/sonivox" path="external/sonivox" revision="d029b2378170cfd7bb34d894482065a762a54578"/>
+  <project name="platform/external/speex" path="external/speex" revision="32e4d0aa78c5879565cbcd06415fa2e344036ab5"/>
+  <project name="platform/external/sqlite" path="external/sqlite" revision="90f23688416d9f4e1e5d0128dca5f26404b6898e"/>
+  <project name="platform/external/srec" path="external/srec" revision="7390035ea61b32477243d60c452664150b61f023"/>
+  <project name="platform/external/stlport" path="external/stlport" remote="linaro-android" revision="f56d1f0242e7eb2800f552e3c3c562b02c26b2b2"/>
+  <project name="platform/external/strace" path="external/strace" revision="cfa96b379cdd6561a5cc89f2bb86ee9f4b2a3928"/>
+  <project name="platform/external/svox" path="external/svox" remote="linaro-android" revision="c54cda009637d7be08e4cd5b829ec0fc3079f60f"/>
+  <project name="platform/external/tagsoup" path="external/tagsoup" revision="68c2ec9e0acdb3214b7fb91dbab8c9fab8736817"/>
+  <project name="platform/external/tcpdump" path="external/tcpdump" remote="linaro-android" revision="616015d52648c7eb6460eb6411aa87581cbb0e13"/>
+  <project name="platform/external/tinyxml" path="external/tinyxml" revision="d589f7e4a51e75bd5c98a3defd8ee84d7059e86e"/>
+  <project name="platform/external/tremolo" path="external/tremolo" revision="9a688754461ebfc91769b5d3c8ba5aba9fe1f376"/>
+  <project name="platform/external/v8" path="external/v8" revision="6599b9dd3411791c9d89ab7efbfb4131e5664c48"/>
+  <project name="platform/external/webkit" path="external/webkit" remote="linaro-android" revision="1e02484fcaef9e1ea900b6e3323b8907c79b4bb2"/>
+  <project name="platform/external/wpa_supplicant" path="external/wpa_supplicant" revision="2b7ee495307e9fd349a0f37ec560834adbc954cc"/>
+  <project name="platform/external/wpa_supplicant_6" path="external/wpa_supplicant_6" revision="b2522a100c9c6688508261b04e83fa1d0bdc88ab"/>
+  <project name="platform/external/x264" path="external/x264" remote="linaro-android" revision="c8be2223e23a49c852557881d8210a70aae9cb5c"/>
+  <project name="platform/external/xmlwriter" path="external/xmlwriter" revision="e95d92246ee35273dde2bee8b00485cc14c12be5"/>
+  <project name="platform/external/yaffs2" path="external/yaffs2" revision="0fe811d9a994dd6df8aa9852c7b9241fa9aa453b"/>
+  <project name="platform/external/zlib" path="external/zlib" revision="96c70b1df1629d7f0eb8f666045bfd5eb062cebf"/>
+  <project name="platform/frameworks/base" path="frameworks/base" remote="linaro-android" revision="a08dc19c13967d6efa54443c21918288d5fb4178"/>
+  <project name="platform/frameworks/ex" path="frameworks/ex" revision="e0d5045a56146f0e7d8ea9e400f6eb209edceec5"/>
+  <project name="platform/frameworks/opt/emoji" path="frameworks/opt/emoji" remote="linaro-android" revision="941fb3d38928a8483701fe2be45ccbc6579f3633"/>
+  <project name="platform/hardware/libhardware" path="hardware/libhardware" remote="linaro-android" revision="f50b075a8b88eff482628e8ab62a04539117c7ea"/>
+  <project name="platform/hardware/libhardware_legacy" path="hardware/libhardware_legacy" revision="17f1ff8c99dada2cca93f68d434cf64a6dc692c2"/>
+  <project name="platform/hardware/ril" path="hardware/ril" revision="3b1530aef62476248825a2092c9aea800395c3b1"/>
+  <project name="platform/libcore" path="libcore" remote="linaro-android" revision="b390cef44c168f9a6cfa8b70cc7861869ab3be5d"/>
+  <project name="platform/ndk" path="ndk" revision="7a619be40e8594a961066a33b7cc9ef52f566988"/>
+  <project name="platform/packages/apps/AccountsAndSyncSettings" path="packages/apps/AccountsAndSyncSettings" revision="0179779e69d0a8ce2879cf27261af9bc2908cae0"/>
+  <project name="platform/packages/apps/Bluetooth" path="packages/apps/Bluetooth" revision="6d48feaaff63b14adc23e7b2d82854189a456f15"/>
+  <project name="platform/packages/apps/Browser" path="packages/apps/Browser" revision="7b6955578d914557eea7ff3cbcec70e953970092"/>
+  <project name="platform/packages/apps/Calculator" path="packages/apps/Calculator" revision="5c85e48a713ec70ebce65ebf1a3622035992f8c3"/>
+  <project name="platform/packages/apps/Calendar" path="packages/apps/Calendar" revision="ee794988e54a2e8172b1482d108924934c0f70cb"/>
+  <project name="platform/packages/apps/Camera" path="packages/apps/Camera" revision="8ff2adc739ca898d0230c702eed7d327e5bbf4dc"/>
+  <project name="platform/packages/apps/CellBroadcastReceiver" path="packages/apps/CellBroadcastReceiver" revision="50a624a47ce645a7992e346e40a4e7ec5e0df9b7"/>
+  <project name="platform/packages/apps/CertInstaller" path="packages/apps/CertInstaller" revision="457ffda6726b8e0f88d78a9267b840d102a8907a"/>
+  <project name="platform/packages/apps/Contacts" path="packages/apps/Contacts" revision="ec0e540fb20a31f77ca561bc4a872e817195627a"/>
+  <project name="platform/packages/apps/DeskClock" path="packages/apps/DeskClock" revision="8e1921f8140f205c115582e4a068c7ba5e79ff9c"/>
+  <project name="platform/packages/apps/Email" path="packages/apps/Email" revision="8c23a70b9123b77511e3ed9bbe827fe0c26bb674"/>
+  <project name="platform/packages/apps/Gallery" path="packages/apps/Gallery" revision="ea32625b6296585a0328886c33159d88e3a2c693"/>
+  <project name="platform/packages/apps/Gallery3D" path="packages/apps/Gallery3D" revision="87a545419820bc665d8fdb13845b65cf9707a7d8"/>
+  <project name="platform/packages/apps/HTMLViewer" path="packages/apps/HTMLViewer" revision="f470146b74d34c21e4d3526574e2bbd0e72a57f0"/>
+  <project name="platform/packages/apps/Launcher2" path="packages/apps/Launcher2" revision="3fd010a6fe457a59d2e983a348e63dc25e836852"/>
+  <project name="platform/packages/apps/Mms" path="packages/apps/Mms" revision="fd1766e6613390ac9d7c0dd8feac8708fa023a2b"/>
+  <project name="platform/packages/apps/Music" path="packages/apps/Music" revision="278aaed1eb37763f7dcb2364523db591014a9210"/>
+  <project name="platform/packages/apps/Nfc" path="packages/apps/Nfc" revision="e4d9ddebb676325c6abfe3b0d4c0aefa8a17d952"/>
+  <project name="platform/packages/apps/PackageInstaller" path="packages/apps/PackageInstaller" revision="6d2974c3f346511f96eba3370398123422e578fc"/>
+  <project name="platform/packages/apps/Phone" path="packages/apps/Phone" revision="54c42aebae50804cb620a35f0f82dd2ce2187e53"/>
+  <project name="platform/packages/apps/Protips" path="packages/apps/Protips" revision="a853d2b914144dd1f2ff3f03170f67d74338815d"/>
+  <project name="platform/packages/apps/QuickSearchBox" path="packages/apps/QuickSearchBox" revision="e8b28b6f1cab74060ea3101b1eee1dfdb32c89e9"/>
+  <project name="platform/packages/apps/Settings" path="packages/apps/Settings" remote="linaro-android" revision="ee25812a8eda802cc144dc416f2dca88d421bcef"/>
+  <project name="platform/packages/apps/SmartCardService" path="packages/apps/SmartCardService" revision="29eae320a4bd222b5ff1c092f84f1aebba88d0b7"/>
+  <project name="platform/packages/apps/SoundRecorder" path="packages/apps/SoundRecorder" revision="20b07a73ec046d23f5cfabaf60d54feb868a5eea"/>
+  <project name="platform/packages/apps/SpeechRecorder" path="packages/apps/SpeechRecorder" revision="f075eb5cefb6357aa7562a6d156bda5383ac087d"/>
+  <project name="platform/packages/apps/Stk" path="packages/apps/Stk" revision="d2f267c7ed48dc77878299e12925bc3c39db5d37"/>
+  <project name="platform/packages/apps/Tag" path="packages/apps/Tag" revision="4b1e01421a564b348fcf7c0203dcb89576883aff"/>
+  <project name="platform/packages/apps/VoiceDialer" path="packages/apps/VoiceDialer" revision="13b6acf2174e8dc23f70def279c85d191c3fcbc1"/>
+  <project name="platform/packages/experimental" path="packages/experimental" revision="504fe3ddddf722e4315b382319970b0e435af27b"/>
+  <project name="platform/packages/inputmethods/LatinIME" path="packages/inputmethods/LatinIME" revision="ec622ced359cfe646efc14b68e25539fa7a438d9"/>
+  <project name="platform/packages/inputmethods/OpenWnn" path="packages/inputmethods/OpenWnn" revision="27ab9d1b806f03554d2abb50de26abe7bf234336"/>
+  <project name="platform/packages/inputmethods/PinyinIME" path="packages/inputmethods/PinyinIME" revision="6b7954e2967754a77c55dc4291941978e3508259"/>
+  <project name="platform/packages/providers/ApplicationsProvider" path="packages/providers/ApplicationsProvider" revision="0234d298ecdffe3a10877d6edffe98e299713caa"/>
+  <project name="platform/packages/providers/CalendarProvider" path="packages/providers/CalendarProvider" revision="959739d351af5d04e8c92f6b031f737348d4b139"/>
+  <project name="platform/packages/providers/ContactsProvider" path="packages/providers/ContactsProvider" revision="c9d8e21bd1e6dbde3208b9475a2697081f8ced79"/>
+  <project name="platform/packages/providers/DownloadProvider" path="packages/providers/DownloadProvider" revision="abb94fb35445de2eadd1804ad2f4023bd50a6b5c"/>
+  <project name="platform/packages/providers/DrmProvider" path="packages/providers/DrmProvider" revision="42f3f2cbfecbbca1d18a5ff91e12619eba740516"/>
+  <project name="platform/packages/providers/GoogleContactsProvider" path="packages/providers/GoogleContactsProvider" revision="4886c7a0cfba5df74b213b1fc8286c6e3f2ddaa2"/>
+  <project name="platform/packages/providers/MediaProvider" path="packages/providers/MediaProvider" revision="2b0e56b7595da308d61d190b529518cdefc98acd"/>
+  <project name="platform/packages/providers/TelephonyProvider" path="packages/providers/TelephonyProvider" revision="6a5c080b90613c5afef04d453ab1498d22aee0a9"/>
+  <project name="platform/packages/providers/UserDictionaryProvider" path="packages/providers/UserDictionaryProvider" revision="d7eb9d4b59640175877a6f53f32b6e3e3d7154e9"/>
+  <project name="platform/packages/wallpapers/Basic" path="packages/wallpapers/Basic" revision="17db0721c8ef2d4f2c6835afaa3c47464730d9b1"/>
+  <project name="platform/packages/wallpapers/LivePicker" path="packages/wallpapers/LivePicker" revision="c114657db62c84b3b10c4e7d879d90ca5fc81d20"/>
+  <project name="platform/packages/wallpapers/MagicSmoke" path="packages/wallpapers/MagicSmoke" revision="4cb26a827ca03cad77522862cc78248e052ea0ca"/>
+  <project name="platform/packages/wallpapers/MusicVisualization" path="packages/wallpapers/MusicVisualization" revision="6759a52f863f60a67941938bd8d4610b01f9d2aa"/>
+  <project name="platform/prebuilt" path="prebuilt" revision="6b399f3609ac871310e9e51ff76393be605c6088"/>
+  <project name="platform/sdk" path="sdk" revision="dee444f860076b07d4b751fa64aba6683b4c377d"/>
+  <project name="platform/system/bluetooth" path="system/bluetooth" revision="7dc550597f490a67c8d020c727bfbf2d9d212d42"/>
+  <project name="platform/system/core" path="system/core" remote="linaro-android" revision="474bcaf1cbf12ff9007181a8093d2c12bc49d5b1"/>
+  <project name="platform/system/extras" path="system/extras" revision="8bdbbe2de23a8a8fc26b7f3a4b7dfdbe1112ac9f"/>
+  <project name="platform/system/media" path="system/media" remote="linaro-android" revision="bb5a707fe803083070c0d7ce475a0b898a522c22"/>
+  <project name="platform/system/netd" path="system/netd" revision="4415a6992691845c86bbb7b8ac9bd4c620338daa"/>
+  <project name="platform/system/vold" path="system/vold" remote="linaro-android" revision="119e194d52621f51892a0c7397f11637c0a5ec69"/>
+  <project name="x-loader/x-loader" path="device/linaro/x-loader" remote="gitorious" revision="c4289f1bee035dea41536c5ba5e1bc36c7d493c4"/>
 </manifest>
diff --git a/tracking-panda.xml b/tracking-panda.xml
deleted file mode 100644
index 15abe1649..000000000
--- a/tracking-panda.xml
+++ /dev/null
@@ -1,226 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<manifest>
-  <remote  name="korg"
-           fetch="git://android.git.linaro.org/"
-           review="review.android.git.linaro.org" />
-  <default revision="refs/tags/android-2.3.5_r1"
-           remote="korg" />
-
-  <remote  name="linaro-android"
-           fetch="git://android.git.linaro.org/"
-           review="review.android.git.linaro.org" />
-
-  <remote  name="linaro-other"
-           fetch="git://git.linaro.org/" />
-
-  <remote  name="0xbench"
-           fetch="git://gitorious.org/0xbench/" />
-
-  <remote  name="gitorious"
-           fetch="git://gitorious.org/" />
-
-  <remote  name="omapzoom"
-           fetch="git://git.omapzoom.org/repo/" />
-
-
-  <!-- Linaro changes -->
-  <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_2.3.5" remote="linaro-android" />
-
-  <project path="device/linaro/beagleboard" name="device/linaro/beagleboard" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="device/linaro/pandaboard" name="device/linaro/pandaboard" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="device/linaro/u8500href" name="device/linaro/u8500href" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="device/linaro/common" name="device/linaro/common" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="system/vold" name="platform/system/vold" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="system/core" name="platform/system/core" revision="linaro_android_2.3.5" remote="linaro-android" />
-
-  <project path="dalvik" name="platform/dalvik" revision="linaro_android_2.3.5" remote="linaro-android"/>
-  <project path="external/elfcopy" name="platform/external/elfcopy" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/skia" name="platform/external/skia" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="frameworks/opt/emoji" name="platform/frameworks/opt/emoji" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="libcore" name="platform/libcore" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="system/media" name="platform/system/media" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/svox" name="platform/external/svox" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/busybox" name="platform/external/busybox" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/wpa_supplicant_6" name="platform/external/wpa_supplicant_6" revision="linaro_android_2.3.5" remote="linaro-android"/>
-  <project name="people/kwerner/libunwind" path="external/libunwind" remote="linaro-other" revision="fc05b927bc13c00d38a540f603f4fcb4f7325846" />
-
-  <!-- Multimedia extensions -->
-  <project path="external/libvpx" name="platform/external/libvpx" revision="linaro-master" remote="linaro-android" />
-  <project path="external/x264" name="platform/external/x264" revision="linaro-master" remote="linaro-android" />
-  <project path="external/ffmpeg" name="platform/external/ffmpeg" revision="linaro-0.8" remote="linaro-android" />
-
-  <!-- Power WG -->
-  <project path="external/powertop" name="platform/external/powertop"  remote="linaro-android" revision="linaro" />
-  <project path="external/ncurses" name="platform/external/ncurses"  remote="linaro-android" revision="linaro" />
-  <project path="external/libnl" name="platform/external/libnl"  remote="linaro-android" revision="linaro" />
-
-  <project path="build" name="platform/build" revision="linaro_android_2.3.5" remote="linaro-android" >
-    <copyfile src="core/root.mk" dest="Makefile" />
-  </project>
-
-  <project path="kernel" name="people/andygreen/repo-branch-archive" revision="tilt-android-tracking" remote="linaro-other" />
-  <project path="u-boot" name="boot/u-boot-linaro-stable" revision="master" remote="linaro-other" />
-
-  <project path="packages/apps/0xbench" name="0xbench" revision="master" remote="0xbench" />
-  <project path="packages/apps/mmtest" name="people/bernhardrosenkranzer/mmtest" revision="master" remote="linaro-other" />
-  <project path="packages/apps/glmark2" name="people/afrantzis/glmark2" revision="master" remote="linaro-other" />
-
-  <project path="external/jpeg" name="people/tomgall/libjpeg-turbo/libjpeg-turbo" revision="1.2-beta-linaro-andoid" remote="linaro-other" />
-  <project path="external/dbus" name="platform/external/dbus" revision="linaro-master" remote="linaro-android" />
-  <project path="bionic" name="platform/bionic" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/fdlibm" name="platform/external/fdlibm" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/icu4c" name="platform/external/icu4c" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/iptables" name="platform/external/iptables" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_2.3.5" remote="linaro-android" />
-
-  <project path="hardware/libhardware" name="platform/hardware/libhardware" revision="linaro_android_2.3.5" remote="linaro-android" />
-
-  <!-- x-loader -->
-  <project path="device/linaro/x-loader" name="x-loader/x-loader" revision="master" remote="gitorious" />
-
-  <!-- proprietary-open - aka SGX et friends -->
-  <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="gingerbread" remote="linaro-android" />
-
-  <!-- TI's uim module for bt -->
-  <project path="device/ti/uim" name="device/ti/uim" revision="android" remote="linaro-android" />
-
-  <!-- standard Andorid manifest -->
-  <project path="bootable/bootloader/legacy" name="platform/bootable/bootloader/legacy" />
-  <project path="bootable/diskinstaller" name="platform/bootable/diskinstaller" />
-  <project path="bootable/recovery" name="platform/bootable/recovery" />
-  <project path="cts" name="platform/cts" />
-  <project path="development" name="platform/development" />
-  <project path="device/common" name="device/common" />
-  <project path="device/google/accessory/arduino" name="device/google/accessory/arduino" />
-  <project path="device/google/accessory/demokit" name="device/google/accessory/demokit" />
-  <project path="device/sample" name="device/sample" />
-  <project path="device/samsung/crespo" name="device/samsung/crespo" />
-  <project path="external/apache-http" name="platform/external/apache-http" />
-  <project path="external/astl" name="platform/external/astl" />
-  <project path="external/bison" name="platform/external/bison" />
-  <project path="external/blktrace" name="platform/external/blktrace" />
-  <project path="external/bluetooth/bluez" name="platform/external/bluetooth/bluez" />
-  <project path="external/bluetooth/glib" name="platform/external/bluetooth/glib" />
-  <project path="external/bluetooth/hcidump" name="platform/external/bluetooth/hcidump" />
-  <project path="external/bouncycastle" name="platform/external/bouncycastle" />
-  <project path="external/bsdiff" name="platform/external/bsdiff" />
-  <project path="external/bzip2" name="platform/external/bzip2" />
-  <project path="external/chromium" name="platform/external/chromium" />
-  <project path="external/clearsilver" name="platform/external/clearsilver" />
-  <project path="external/dhcpcd" name="platform/external/dhcpcd" />
-  <project path="external/dropbear" name="platform/external/dropbear" />
-  <project path="external/e2fsprogs" name="platform/external/e2fsprogs" />
-  <project path="external/easymock" name="platform/external/easymock" />
-  <project path="external/elfutils" name="platform/external/elfutils" />
-  <project path="external/embunit" name="platform/external/embunit" />
-  <project path="external/emma" name="platform/external/emma" />
-  <project path="external/esd" name="platform/external/esd" />
-  <project path="external/expat" name="platform/external/expat" />
-  <project path="external/freetype" name="platform/external/freetype" />
-  <project path="external/fsck_msdos" name="platform/external/fsck_msdos" />
-  <project path="external/genext2fs" name="platform/external/genext2fs" />
-  <project path="external/giflib" name="platform/external/giflib" />
-  <project path="external/grub" name="platform/external/grub" />
-  <project path="external/gtest" name="platform/external/gtest" />
-  <project path="external/guava" name="platform/external/guava" />
-  <project path="external/iproute2" name="platform/external/iproute2" />
-  <project path="external/ipsec-tools" name="platform/external/ipsec-tools" />
-  <project path="external/jdiff" name="platform/external/jdiff" />
-  <project path="external/jhead" name="platform/external/jhead" />
-  <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/libgsm" name="platform/external/libgsm" />
-  <project path="external/libnfc-nxp" name="platform/external/libnfc-nxp" />
-  <project path="external/libpcap" name="platform/external/libpcap" />
-  <project path="external/libpng" name="platform/external/libpng" />
-  <project path="external/libxml2" name="platform/external/libxml2" />
-  <project path="external/mtpd" name="platform/external/mtpd" />
-  <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/nist-sip" name="platform/external/nist-sip" />
-  <project path="external/oauth" name="platform/external/oauth" />
-  <project path="external/openssl" name="platform/external/openssl" />
-  <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/protobuf" name="platform/external/protobuf" />
-  <project path="external/qemu" name="platform/external/qemu" />
-  <project path="external/quake" name="platform/external/quake" />
-  <project path="external/safe-iop" name="platform/external/safe-iop" />
-  <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/strace" name="platform/external/strace" />
-  <project path="external/tagsoup" name="platform/external/tagsoup" />
-  <project path="external/tinyxml" name="platform/external/tinyxml" />
-  <project path="external/tremolo" name="platform/external/tremolo" />
-  <project path="external/v8" name="platform/external/v8" />
-  <project path="external/wpa_supplicant" name="platform/external/wpa_supplicant" />
-  <project path="external/xmlwriter" name="platform/external/xmlwriter" />
-  <project path="external/yaffs2" name="platform/external/yaffs2" />
-  <project path="external/zlib" name="platform/external/zlib" />
-  <project path="frameworks/ex" name="platform/frameworks/ex" />
-  <project path="hardware/ril" name="platform/hardware/ril" />
-  <project path="ndk" name="platform/ndk" />
-  <project path="packages/apps/AccountsAndSyncSettings" name="platform/packages/apps/AccountsAndSyncSettings" />
-  <project path="packages/apps/Bluetooth" name="platform/packages/apps/Bluetooth" />
-  <project path="packages/apps/Browser" name="platform/packages/apps/Browser" />
-  <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="platform/packages/apps/Camera" />
-  <project path="packages/apps/CellBroadcastReceiver" name="platform/packages/apps/CellBroadcastReceiver" />
-  <project path="packages/apps/CertInstaller" name="platform/packages/apps/CertInstaller" />
-  <project path="packages/apps/Contacts" name="platform/packages/apps/Contacts" />
-  <project path="packages/apps/DeskClock" name="platform/packages/apps/DeskClock" />
-  <project path="packages/apps/Email" name="platform/packages/apps/Email" />
-  <project path="packages/apps/Gallery" name="platform/packages/apps/Gallery" />
-  <project path="packages/apps/Gallery3D" name="platform/packages/apps/Gallery3D" />
-  <project path="packages/apps/HTMLViewer" name="platform/packages/apps/HTMLViewer" />
-  <project path="packages/apps/Launcher2" name="platform/packages/apps/Launcher2" />
-  <project path="packages/apps/Mms" name="platform/packages/apps/Mms" />
-  <project path="packages/apps/Music" name="platform/packages/apps/Music" />
-  <project path="packages/apps/Nfc" name="platform/packages/apps/Nfc" />
-  <project path="packages/apps/PackageInstaller" name="platform/packages/apps/PackageInstaller" />
-  <project path="packages/apps/Phone" name="platform/packages/apps/Phone" />
-  <project path="packages/apps/Protips" name="platform/packages/apps/Protips" />
-  <project path="packages/apps/QuickSearchBox" name="platform/packages/apps/QuickSearchBox" />
-  <project path="packages/apps/SmartCardService" name="platform/packages/apps/SmartCardService" />
-  <project path="packages/apps/SoundRecorder" name="platform/packages/apps/SoundRecorder" />
-  <project path="packages/apps/SpeechRecorder" name="platform/packages/apps/SpeechRecorder" />
-  <project path="packages/apps/Stk" name="platform/packages/apps/Stk" />
-  <project path="packages/apps/Tag" name="platform/packages/apps/Tag" />
-  <project path="packages/apps/VoiceDialer" name="platform/packages/apps/VoiceDialer" />
-  <project path="packages/experimental" name="platform/packages/experimental" />
-  <project path="packages/inputmethods/LatinIME" name="platform/packages/inputmethods/LatinIME" />
-  <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="platform/packages/providers/DownloadProvider" />
-  <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="platform/packages/providers/MediaProvider" />
-  <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="platform/packages/wallpapers/Basic" />
-  <project path="packages/wallpapers/LivePicker" name="platform/packages/wallpapers/LivePicker" />
-  <project path="packages/wallpapers/MagicSmoke" name="platform/packages/wallpapers/MagicSmoke" />
-  <project path="packages/wallpapers/MusicVisualization" name="platform/packages/wallpapers/MusicVisualization" />
-  <project path="prebuilt" name="platform/prebuilt" />
-  <project path="sdk" name="platform/sdk" />
-  <project path="system/bluetooth" name="platform/system/bluetooth" />
-  <project path="system/extras" name="platform/system/extras" />
-  <project path="system/netd" name="platform/system/netd" />
-
-</manifest>