Move all boards over to Android 2.3.7

modified:   landing-snowball.xml
modified:   staging-iMX53.xml
modified:   staging-origen.xml
modified:   staging-panda.xml
modified:   staging-snowball.xml
modified:   staging-vexpress-a9.xml

Change-Id: I8a4cb942c3e3b56366f84df478d32ee3e7685486

6 files changed, 199 insertions, 193 deletions

diff --git a/landing-snowball.xml b/landing-snowball.xml
index 9bba098d3..eadfbb016 100644
--- a/landing-snowball.xml
+++ b/landing-snowball.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
-  <remote  name="korg"
+  <remote  name="aosp"
            fetch="git://android.git.linaro.org/"
            review="review.android.git.linaro.org" />
-  <default revision="refs/tags/android-2.3.5_r1"
-           remote="korg" />
+
+  <default revision="refs/tags/android-2.3.7_r1"
+           remote="aosp"
+           sync-j="4" />
 
   <remote  name="linaro-android"
            fetch="git://android.git.linaro.org/"
@@ -26,38 +28,38 @@
   <project path="external/gator" name="arm/ds5/gator" revision="android" remote="linaro-other" />
 
   <!-- 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/dropbear" name="platform/external/dropbear" 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/freetype" name="platform/external/freetype" 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/v8" name="platform/external/v8" 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="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_2.3.7" remote="linaro-android" />
+
+  <project path="device/linaro/beagleboard" name="device/linaro/beagleboard" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="device/linaro/pandaboard" name="device/linaro/pandaboard" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="device/linaro/u8500href" name="device/linaro/u8500href" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="device/linaro/snowball" name="device/linaro/snowball" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="device/linaro/common" name="device/linaro/common" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="system/vold" name="platform/system/vold" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="system/core" name="platform/system/core" revision="linaro_android_2.3.7" remote="linaro-android" />
+
+  <project path="dalvik" name="platform/dalvik" revision="linaro_android_2.3.7" remote="linaro-android"/>
+  <project path="external/dropbear" name="platform/external/dropbear" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="external/elfcopy" name="platform/external/elfcopy" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="external/freetype" name="platform/external/freetype" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="external/skia" name="platform/external/skia" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="external/v8" name="platform/external/v8" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="frameworks/opt/emoji" name="platform/frameworks/opt/emoji" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="libcore" name="platform/libcore" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="system/media" name="platform/system/media" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="external/svox" name="platform/external/svox" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="external/busybox" name="platform/external/busybox" revision="linaro_android_2.3.7" remote="linaro-android" />
   <project path="external/lrzsz" name="platform/external/lrzsz" revision="linaro-master" remote="linaro-android" />
-  <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/tremolo" name="platform/external/tremolo" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="hardware/alsa_sound" name="platform/hardware/alsa_sound" 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/linaro/common" name="hardware/linaro/common" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="hardware/linaro/pandaboard" name="hardware/linaro/pandaboard" revision="linaro_android_2.3.5" remote="linaro-android" />
+  <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="external/tremolo" name="platform/external/tremolo" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="hardware/alsa_sound" name="platform/hardware/alsa_sound" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="hardware/libhardware" name="platform/hardware/libhardware" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="hardware/linaro/common" name="hardware/linaro/common" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="hardware/linaro/pandaboard" name="hardware/linaro/pandaboard" revision="linaro_android_2.3.7" remote="linaro-android" />
   <project name="people/kwerner/libunwind" path="external/libunwind" remote="linaro-other" revision="android" />
-  <project path="prebuilt" name="platform/prebuilt" remote="linaro-android" revision="linaro_android_2.3.5" />
+  <project path="prebuilt" name="platform/prebuilt" remote="linaro-android" revision="linaro_android_2.3.7" />
 
   <!-- Multimedia extensions -->
   <project path="external/libvpx" name="platform/external/libvpx" revision="linaro-master" remote="linaro-android" />
@@ -69,7 +71,7 @@
   <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" >
+  <project path="build" name="platform/build" revision="linaro_android_2.3.7" remote="linaro-android" >
     <copyfile src="core/root.mk" dest="Makefile" />
   </project>
 
@@ -81,15 +83,15 @@
   <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="external/libnfc-nxp" name="platform/external/libnfc-nxp" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/libpng" name="platform/external/libpng" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="bootable/recovery" name="platform/bootable/recovery" revision="linaro_android_2.3.5" remote="linaro-android" />
+  <project path="bionic" name="platform/bionic" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="external/fdlibm" name="platform/external/fdlibm" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="external/icu4c" name="platform/external/icu4c" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="external/iptables" name="platform/external/iptables" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="external/libnfc-nxp" name="platform/external/libnfc-nxp" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="external/libpng" name="platform/external/libpng" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="bootable/recovery" name="platform/bootable/recovery" revision="linaro_android_2.3.7" remote="linaro-android" />
 
   <!-- x-loader -->
   <project path="device/linaro/x-loader" name="x-loader/x-loader" revision="master" remote="gitorious" />
diff --git a/staging-iMX53.xml b/staging-iMX53.xml
index fc0c2afc0..7ca2613a1 100644
--- a/staging-iMX53.xml
+++ b/staging-iMX53.xml
@@ -29,26 +29,26 @@
   <project path="external/gator" name="arm/ds5/gator" revision="android" remote="linaro-other" />
 
   <!-- 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/dropbear" name="platform/external/dropbear" 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/freetype" name="platform/external/freetype" 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/v8" name="platform/external/v8" 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="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_2.3.7" remote="linaro-android" />
+
+  <project path="device/linaro/iMX53" name="device/linaro/imx53" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="device/linaro/beagleboard" name="device/linaro/beagleboard" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="device/linaro/pandaboard" name="device/linaro/pandaboard" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="device/linaro/u8500href" name="device/linaro/u8500href" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="device/linaro/common" name="device/linaro/common" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="system/vold" name="platform/system/vold" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="system/core" name="platform/system/core" revision="linaro_android_2.3.7" remote="linaro-android" />
+
+  <project path="dalvik" name="platform/dalvik" revision="linaro_android_2.3.7" remote="linaro-android"/>
+  <project path="external/dropbear" name="platform/external/dropbear" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="external/elfcopy" name="platform/external/elfcopy" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="external/freetype" name="platform/external/freetype" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="external/skia" name="platform/external/skia" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="external/v8" name="platform/external/v8" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="frameworks/opt/emoji" name="platform/frameworks/opt/emoji" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="libcore" name="platform/libcore" revision="linaro_android_2.3.7" remote="linaro-android" />
   <project path="system/media" name="platform/system/media" revision="linaro_android_2.3.7" remote="linaro-android" />
   <project path="external/svox" name="platform/external/svox" revision="linaro_android_2.3.7" remote="linaro-android" />
   <project path="external/busybox" name="platform/external/busybox" revision="linaro_android_2.3.7" remote="linaro-android" />
diff --git a/staging-origen.xml b/staging-origen.xml
index 577acc455..69321283e 100644
--- a/staging-origen.xml
+++ b/staging-origen.xml
@@ -26,29 +26,29 @@
   <project path="external/gator" name="arm/ds5/gator" revision="android" remote="linaro-other" />
 
   <!-- 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="device/samsung/proprietary-open" name="device/samsung/proprietary-open" 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/dropbear" name="platform/external/dropbear" 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/freetype" name="platform/external/freetype" 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/v8" name="platform/external/v8" 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="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_2.3.7" remote="linaro-android" />
+
+  <project path="device/linaro/beagleboard" name="device/linaro/beagleboard" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="device/linaro/pandaboard" name="device/linaro/pandaboard" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="device/linaro/u8500href" name="device/linaro/u8500href" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="device/linaro/origen" name="device/linaro/origen" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="device/linaro/common" name="device/linaro/common" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="device/samsung/proprietary-open" name="device/samsung/proprietary-open" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="system/vold" name="platform/system/vold" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="system/core" name="platform/system/core" revision="linaro_android_2.3.7" remote="linaro-android" />
+
+  <project path="dalvik" name="platform/dalvik" revision="linaro_android_2.3.7" remote="linaro-android"/>
+  <project path="external/dropbear" name="platform/external/dropbear" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="external/elfcopy" name="platform/external/elfcopy" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="external/freetype" name="platform/external/freetype" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="external/skia" name="platform/external/skia" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="external/v8" name="platform/external/v8" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="frameworks/opt/emoji" name="platform/frameworks/opt/emoji" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="libcore" name="platform/libcore" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="system/media" name="platform/system/media" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="external/svox" name="platform/external/svox" revision="linaro_android_2.3.7" remote="linaro-android" />
   <project path="external/busybox" name="platform/external/busybox" revision="linaro_android_2.3.7" remote="linaro-android" />
   <project path="external/lrzsz" name="platform/external/lrzsz" revision="linaro-master" remote="linaro-android" />
   <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_2.3.7" remote="linaro-android" />
diff --git a/staging-panda.xml b/staging-panda.xml
index 88f686fa7..9b24f0ae7 100644
--- a/staging-panda.xml
+++ b/staging-panda.xml
@@ -26,28 +26,28 @@
   <project path="external/gator" name="arm/ds5/gator" revision="android" remote="linaro-other" />
 
   <!-- 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/dropbear" name="platform/external/dropbear" 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/freetype" name="platform/external/freetype" 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/v8" name="platform/external/v8" 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="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_2.3.7" remote="linaro-android" />
+
+  <project path="device/linaro/beagleboard" name="device/linaro/beagleboard" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="device/linaro/pandaboard" name="device/linaro/pandaboard" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="device/linaro/u8500href" name="device/linaro/u8500href" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="device/linaro/common" name="device/linaro/common" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="system/vold" name="platform/system/vold" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="system/core" name="platform/system/core" revision="linaro_android_2.3.7" remote="linaro-android" />
+
+  <project path="dalvik" name="platform/dalvik" revision="linaro_android_2.3.7" remote="linaro-android"/>
+  <project path="external/dropbear" name="platform/external/dropbear" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="external/elfcopy" name="platform/external/elfcopy" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="external/freetype" name="platform/external/freetype" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="external/skia" name="platform/external/skia" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="external/v8" name="platform/external/v8" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="frameworks/opt/emoji" name="platform/frameworks/opt/emoji" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="libcore" name="platform/libcore" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="system/media" name="platform/system/media" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="external/svox" name="platform/external/svox" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="external/busybox" name="platform/external/busybox" revision="linaro_android_2.3.7" remote="linaro-android" />
   <project path="external/lrzsz" name="platform/external/lrzsz" revision="linaro-master" remote="linaro-android" />
   <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_2.3.7" remote="linaro-android" />
   <project path="external/tremolo" name="platform/external/tremolo" revision="linaro_android_2.3.7" remote="linaro-android" />
diff --git a/staging-snowball.xml b/staging-snowball.xml
index f8dca36d4..d47e6dcab 100644
--- a/staging-snowball.xml
+++ b/staging-snowball.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
-  <remote  name="korg"
+  <remote  name="aosp"
            fetch="git://android.git.linaro.org/"
            review="review.android.git.linaro.org" />
-  <default revision="refs/tags/android-2.3.5_r1"
-           remote="korg" />
+
+  <default revision="refs/tags/android-2.3.7_r1"
+           remote="aosp"
+           sync-j="4" />
 
   <remote  name="linaro-android"
            fetch="git://android.git.linaro.org/"
@@ -26,38 +28,38 @@
   <project path="external/gator" name="arm/ds5/gator" revision="android" remote="linaro-other" />
 
   <!-- 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/dropbear" name="platform/external/dropbear" 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/freetype" name="platform/external/freetype" 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/v8" name="platform/external/v8" 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="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_2.3.7" remote="linaro-android" />
+
+  <project path="device/linaro/beagleboard" name="device/linaro/beagleboard" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="device/linaro/pandaboard" name="device/linaro/pandaboard" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="device/linaro/u8500href" name="device/linaro/u8500href" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="device/linaro/snowball" name="device/linaro/snowball" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="device/linaro/common" name="device/linaro/common" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="system/vold" name="platform/system/vold" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="system/core" name="platform/system/core" revision="linaro_android_2.3.7" remote="linaro-android" />
+
+  <project path="dalvik" name="platform/dalvik" revision="linaro_android_2.3.7" remote="linaro-android"/>
+  <project path="external/dropbear" name="platform/external/dropbear" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="external/elfcopy" name="platform/external/elfcopy" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="external/freetype" name="platform/external/freetype" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="external/skia" name="platform/external/skia" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="external/v8" name="platform/external/v8" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="frameworks/opt/emoji" name="platform/frameworks/opt/emoji" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="libcore" name="platform/libcore" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="system/media" name="platform/system/media" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="external/svox" name="platform/external/svox" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="external/busybox" name="platform/external/busybox" revision="linaro_android_2.3.7" remote="linaro-android" />
   <project path="external/lrzsz" name="platform/external/lrzsz" revision="linaro-master" remote="linaro-android" />
-  <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/tremolo" name="platform/external/tremolo" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="hardware/alsa_sound" name="platform/hardware/alsa_sound" 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/linaro/common" name="hardware/linaro/common" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="hardware/linaro/pandaboard" name="hardware/linaro/pandaboard" revision="linaro_android_2.3.5" remote="linaro-android" />
+  <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="external/tremolo" name="platform/external/tremolo" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="hardware/alsa_sound" name="platform/hardware/alsa_sound" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="hardware/libhardware" name="platform/hardware/libhardware" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="hardware/linaro/common" name="hardware/linaro/common" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="hardware/linaro/pandaboard" name="hardware/linaro/pandaboard" revision="linaro_android_2.3.7" remote="linaro-android" />
   <project name="people/kwerner/libunwind" path="external/libunwind" remote="linaro-other" revision="android" />
-  <project path="prebuilt" name="platform/prebuilt" remote="linaro-android" revision="linaro_android_2.3.5" />
+  <project path="prebuilt" name="platform/prebuilt" remote="linaro-android" revision="linaro_android_2.3.7" />
 
   <!-- Multimedia extensions -->
   <project path="external/libvpx" name="platform/external/libvpx" revision="linaro-master" remote="linaro-android" />
@@ -69,7 +71,7 @@
   <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" >
+  <project path="build" name="platform/build" revision="linaro_android_2.3.7" remote="linaro-android" >
     <copyfile src="core/root.mk" dest="Makefile" />
   </project>
 
@@ -81,15 +83,15 @@
   <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="external/libnfc-nxp" name="platform/external/libnfc-nxp" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/libpng" name="platform/external/libpng" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="bootable/recovery" name="platform/bootable/recovery" revision="linaro_android_2.3.5" remote="linaro-android" />
+  <project path="bionic" name="platform/bionic" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="external/fdlibm" name="platform/external/fdlibm" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="external/icu4c" name="platform/external/icu4c" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="external/iptables" name="platform/external/iptables" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="external/libnfc-nxp" name="platform/external/libnfc-nxp" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="external/libpng" name="platform/external/libpng" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="bootable/recovery" name="platform/bootable/recovery" revision="linaro_android_2.3.7" remote="linaro-android" />
 
   <!-- x-loader -->
   <project path="device/linaro/x-loader" name="x-loader/x-loader" revision="master" remote="gitorious" />
diff --git a/staging-vexpress-a9.xml b/staging-vexpress-a9.xml
index f436c2453..462cebd52 100644
--- a/staging-vexpress-a9.xml
+++ b/staging-vexpress-a9.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
-  <remote  name="korg"
+  <remote  name="aosp"
            fetch="git://android.git.linaro.org/"
            review="review.android.git.linaro.org" />
-  <default revision="refs/tags/android-2.3.5_r1"
-           remote="korg" />
+
+  <default revision="refs/tags/android-2.3.7_r1"
+           remote="aosp"
+           sync-j="4" />
 
   <remote  name="linaro-android"
            fetch="git://android.git.linaro.org/"
@@ -26,45 +28,45 @@
   <project path="external/gator" name="arm/ds5/gator" revision="android" remote="linaro-other" />
 
   <!-- 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_upstream" 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/vexpress_a9" name="device/linaro/vexpress-a9" 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/dropbear" name="platform/external/dropbear" 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/freetype" name="platform/external/freetype" 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="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_2.3.7" remote="linaro-android" />
+
+  <project path="device/linaro/beagleboard" name="device/linaro/beagleboard" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="device/linaro/pandaboard" name="device/linaro/pandaboard" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="device/linaro/u8500href" name="device/linaro/u8500href" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="device/linaro/vexpress_a9" name="device/linaro/vexpress-a9" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="device/linaro/common" name="device/linaro/common" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="system/vold" name="platform/system/vold" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="system/core" name="platform/system/core" revision="linaro_android_2.3.7" remote="linaro-android" />
+
+  <project path="dalvik" name="platform/dalvik" revision="linaro_android_2.3.7" remote="linaro-android"/>
+  <project path="external/dropbear" name="platform/external/dropbear" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="external/elfcopy" name="platform/external/elfcopy" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="external/freetype" name="platform/external/freetype" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="external/skia" name="platform/external/skia" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="frameworks/opt/emoji" name="platform/frameworks/opt/emoji" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="libcore" name="platform/libcore" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="system/media" name="platform/system/media" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="external/svox" name="platform/external/svox" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="external/busybox" name="platform/external/busybox" revision="linaro_android_2.3.7" remote="linaro-android" />
   <project path="external/lrzsz" name="platform/external/lrzsz" revision="linaro-master" remote="linaro-android" />
-  <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/tremolo" name="platform/external/tremolo" revision="linaro_android_2.3.5" remote="linaro-android" />
+  <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="external/tremolo" name="platform/external/tremolo" revision="linaro_android_2.3.7" remote="linaro-android" />
 
-  <project path="hardware/alsa_sound" name="platform/hardware/alsa_sound" 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/linaro/common" name="hardware/linaro/common" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="hardware/linaro/pandaboard" name="hardware/linaro/pandaboard" revision="linaro_android_2.3.5" remote="linaro-android" />
+  <project path="hardware/alsa_sound" name="platform/hardware/alsa_sound" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="hardware/libhardware" name="platform/hardware/libhardware" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="hardware/linaro/common" name="hardware/linaro/common" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="hardware/linaro/pandaboard" name="hardware/linaro/pandaboard" revision="linaro_android_2.3.7" remote="linaro-android" />
   <project name="people/kwerner/libunwind" path="external/libunwind" remote="linaro-other" revision="android" />
-  <project path="prebuilt" name="platform/prebuilt" remote="linaro-android" revision="linaro_android_2.3.5" />
+  <project path="prebuilt" name="platform/prebuilt" remote="linaro-android" revision="linaro_android_2.3.7" />
 
   <!-- 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" >
+  <project path="build" name="platform/build" revision="linaro_android_2.3.7" remote="linaro-android" >
     <copyfile src="core/root.mk" dest="Makefile" />
   </project>
 
@@ -78,15 +80,15 @@
   <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="external/libnfc-nxp" name="platform/external/libnfc-nxp" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/libpng" name="platform/external/libpng" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="bootable/recovery" name="platform/bootable/recovery" revision="linaro_android_2.3.5" remote="linaro-android" />
+  <project path="bionic" name="platform/bionic" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="external/fdlibm" name="platform/external/fdlibm" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="external/icu4c" name="platform/external/icu4c" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="external/iptables" name="platform/external/iptables" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="external/libnfc-nxp" name="platform/external/libnfc-nxp" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="external/libpng" name="platform/external/libpng" revision="linaro_android_2.3.7" remote="linaro-android" />
+  <project path="bootable/recovery" name="platform/bootable/recovery" revision="linaro_android_2.3.7" remote="linaro-android" />
 
  <!-- x-loader -->
   <project path="device/linaro/x-loader" name="x-loader/x-loader" revision="master" remote="gitorious" />