Merged in manifest for AOSP 2.3.7

1 files changed, 41 insertions, 40 deletions

diff --git a/default.xml b/default.xml
index 27d792259..8548337b0 100644
--- a/default.xml
+++ b/default.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,44 +28,44 @@
   <project path="external/gator" name="people/pawelmoll/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/common" name="device/linaro/common" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="system/vold" name="platform/system/vold" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="system/core" name="platform/system/core" revision="linaro_android_2.3.5" remote="linaro-android" />
-
-  <project path="dalvik" name="platform/dalvik" revision="linaro_android_2.3.5" remote="linaro-android"/>
-  <project path="external/elfcopy" name="platform/external/elfcopy" revision="linaro_android_2.3.5" remote="linaro-android" />
-  <project path="external/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_upstream" 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="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>
 
@@ -77,13 +79,13 @@
   <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="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" />
  
  <!-- x-loader -->
   <project path="device/linaro/x-loader" name="x-loader/x-loader" revision="master" remote="gitorious" />
@@ -221,5 +223,4 @@
   <project path="system/bluetooth" name="platform/system/bluetooth" />
   <project path="system/extras" name="platform/system/extras" />
   <project path="system/netd" name="platform/system/netd" />
-
 </manifest>