Merge branch 'linaro_android_2.3.5' into linaro_android_2.3.7

Change-Id: I216d58d5699e852f5dbaca580b2f9289e9325d2c

8 files changed, 98 insertions, 97 deletions

diff --git a/default.xml b/default.xml
index 685cf9952..e94a28654 100644
--- a/default.xml
+++ b/default.xml
@@ -25,7 +25,7 @@
            fetch="git://git.omapzoom.org/repo/" />
 
   <!-- GATOR -->
-  <project path="external/gator" name="people/pawelmoll/gator" revision="android" remote="linaro-other" />
+  <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.7" remote="linaro-android" />
@@ -38,6 +38,7 @@
   <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" />
@@ -86,6 +87,8 @@
   <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" />
@@ -93,7 +96,6 @@
   <!-- 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" />
@@ -116,7 +118,6 @@
   <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" />
@@ -140,7 +141,6 @@
   <project path="external/libffi" name="platform/external/libffi" />
   <project path="external/libgsm" name="platform/external/libgsm" />
   <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" />
diff --git a/landing-snowball.xml b/landing-snowball.xml
index 388d97cb9..9bba098d3 100644
--- a/landing-snowball.xml
+++ b/landing-snowball.xml
@@ -23,7 +23,7 @@
            fetch="git://igloocommunity.org/" />
 
   <!-- GATOR -->
-  <project path="external/gator" name="people/pawelmoll/gator" revision="android" remote="linaro-other" />
+  <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" />
@@ -37,6 +37,7 @@
   <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" />
@@ -87,6 +88,8 @@
   <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" />
 
   <!-- x-loader -->
   <project path="device/linaro/x-loader" name="x-loader/x-loader" revision="master" remote="gitorious" />
@@ -94,7 +97,6 @@
   <!-- 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" />
@@ -117,7 +119,6 @@
   <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" />
@@ -141,7 +142,6 @@
   <project path="external/libffi" name="platform/external/libffi" />
   <project path="external/libgsm" name="platform/external/libgsm" />
   <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" />
diff --git a/staging-iMX53.xml b/staging-iMX53.xml
index e58e5e2d0..fc0c2afc0 100644
--- a/staging-iMX53.xml
+++ b/staging-iMX53.xml
@@ -26,28 +26,29 @@
            fetch="http://opensource.freescale.com/pub/scm/imx/" />
 
   <!-- GATOR -->
-  <project path="external/gator" name="people/pawelmoll/gator" revision="android" remote="linaro-other" />
+  <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.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/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="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="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" />
@@ -95,6 +96,8 @@
   <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" />
@@ -102,7 +105,6 @@
   <!-- 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" />
@@ -125,7 +127,6 @@
   <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" />
@@ -149,7 +150,6 @@
   <project path="external/libffi" name="platform/external/libffi" />
   <project path="external/libgsm" name="platform/external/libgsm" />
   <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" />
diff --git a/staging-origen.xml b/staging-origen.xml
index 729686d06..577acc455 100644
--- a/staging-origen.xml
+++ b/staging-origen.xml
@@ -23,30 +23,32 @@
            fetch="git://git.omapzoom.org/repo/" />
 
   <!-- GATOR -->
-  <project path="external/gator" name="people/pawelmoll/gator" revision="android" remote="linaro-other" />
+  <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.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="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/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="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="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" />
@@ -89,6 +91,8 @@
   <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" />
@@ -96,7 +100,6 @@
   <!-- 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" />
@@ -119,7 +122,6 @@
   <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" />
@@ -143,7 +145,6 @@
   <project path="external/libffi" name="platform/external/libffi" />
   <project path="external/libgsm" name="platform/external/libgsm" />
   <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" />
diff --git a/staging-panda.xml b/staging-panda.xml
index 704a32770..88f686fa7 100644
--- a/staging-panda.xml
+++ b/staging-panda.xml
@@ -23,30 +23,31 @@
            fetch="git://git.omapzoom.org/repo/" />
 
   <!-- GATOR -->
-  <project path="external/gator" name="people/pawelmoll/gator" revision="android" remote="linaro-other" />
+  <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.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/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="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="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" />
@@ -72,7 +73,7 @@
     <copyfile src="core/root.mk" dest="Makefile" />
   </project>
 
-  <project path="kernel" name="people/andygreen/repo-branch-archive" revision="tilt-linaro-android-3.0" remote="linaro-other" />
+  <project path="kernel" name="people/andygreen/repo-branch-archive" revision="tilt-android-3.1" 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" />
@@ -88,6 +89,8 @@
   <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" />
 
   <project path="hardware/libhardware" name="platform/hardware/libhardware" revision="linaro_android_2.3.7" remote="linaro-android" />
 
@@ -103,7 +106,6 @@
   <!-- 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" />
@@ -126,7 +128,6 @@
   <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" />
@@ -150,7 +151,6 @@
   <project path="external/libffi" name="platform/external/libffi" />
   <project path="external/libgsm" name="platform/external/libgsm" />
   <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" />
diff --git a/staging-snowball.xml b/staging-snowball.xml
index 7c63f7f8a..f8dca36d4 100644
--- a/staging-snowball.xml
+++ b/staging-snowball.xml
@@ -23,7 +23,7 @@
            fetch="git://igloocommunity.org/" />
 
   <!-- GATOR -->
-  <project path="external/gator" name="people/pawelmoll/gator" revision="android" remote="linaro-other" />
+  <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" />
@@ -37,6 +37,7 @@
   <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" />
@@ -87,6 +88,8 @@
   <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" />
 
   <!-- x-loader -->
   <project path="device/linaro/x-loader" name="x-loader/x-loader" revision="master" remote="gitorious" />
@@ -94,7 +97,6 @@
   <!-- 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" />
@@ -117,7 +119,6 @@
   <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" />
@@ -141,7 +142,6 @@
   <project path="external/libffi" name="platform/external/libffi" />
   <project path="external/libgsm" name="platform/external/libgsm" />
   <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" />
diff --git a/staging-vexpress-a9.xml b/staging-vexpress-a9.xml
index 1c27afa84..f436c2453 100644
--- a/staging-vexpress-a9.xml
+++ b/staging-vexpress-a9.xml
@@ -23,7 +23,7 @@
            fetch="git://git.omapzoom.org/repo/" />
 
   <!-- GATOR -->
-  <project path="external/gator" name="people/pawelmoll/gator" revision="android" remote="linaro-other" />
+  <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" />
@@ -31,12 +31,13 @@
   <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="people/tixy/android-vexpress-a9" revision="linaro_android_2.3.5" remote="linaro-other" />
+  <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" />
@@ -67,7 +68,7 @@
     <copyfile src="core/root.mk" dest="Makefile" />
   </project>
 
-  <project path="kernel" name="people/tixy/android-kernel" revision="armlt-3.1-vexpress-a9" remote="linaro-other" />
+  <project path="kernel" name="kernel/vexpress-a9" revision="armlt-linaro-android-3.1" 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" />
@@ -84,6 +85,8 @@
   <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" />
 
  <!-- x-loader -->
   <project path="device/linaro/x-loader" name="x-loader/x-loader" revision="master" remote="gitorious" />
@@ -91,7 +94,6 @@
   <!-- 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" />
@@ -114,7 +116,6 @@
   <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" />
@@ -138,7 +139,6 @@
   <project path="external/libffi" name="platform/external/libffi" />
   <project path="external/libgsm" name="platform/external/libgsm" />
   <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" />
diff --git a/tracking-panda.xml b/tracking-panda.xml
index f3e227b8e..628f5a306 100644
--- a/tracking-panda.xml
+++ b/tracking-panda.xml
@@ -23,7 +23,7 @@
            fetch="git://git.omapzoom.org/repo/" />
 
   <!-- GATOR -->
-  <project path="external/gator" name="people/pawelmoll/gator" revision="android" remote="linaro-other" />
+  <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.7" remote="linaro-android" />
@@ -36,6 +36,7 @@
   <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" />
@@ -53,7 +54,7 @@
   <project path="hardware/alsa_sound" name="platform/hardware/alsa_sound" revision="linaro_android_2.3.7" remote="linaro-android" />
   <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" 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 path="hardware/linaro/pandaboard" name="hardware/linaro/pandaboard" revision="linaro_android_2.3.7_tracking" remote="linaro-android" />
   <project path="external/wpa_supplicant_6" name="platform/external/wpa_supplicant_6" 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.7" />
@@ -88,6 +89,8 @@
   <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" />
 
   <project path="hardware/libhardware" name="platform/hardware/libhardware" revision="linaro_android_2.3.7" remote="linaro-android" />
 
@@ -103,7 +106,6 @@
   <!-- 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" />
@@ -126,7 +128,6 @@
   <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" />
@@ -150,7 +151,6 @@
   <project path="external/libffi" name="platform/external/libffi" />
   <project path="external/libgsm" name="platform/external/libgsm" />
   <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" />