Merge from gingerbread
Change-Id: I2eb7136a1bf5aa57b1a2c28de71aa4dd7fce178d
diff --git a/default.xml b/default.xml
index 48e89da..876e0e4 100644
--- a/default.xml
+++ b/default.xml
@@ -3,7 +3,7 @@
<remote name="aosp"
fetch=".." />
- <default revision="gingerbread"
+ <default revision="master"
remote="aosp"
sync-j="4" />
@@ -26,7 +26,9 @@
<project path="device/sample" name="device/sample" />
<project path="device/samsung/crespo" name="device/samsung/crespo" />
<project path="device/samsung/crespo4g" name="device/samsung/crespo4g" />
+ <project path="docs/source.android.com" name="platform/docs/source.android.com" />
<project path="external/apache-http" name="platform/external/apache-http" />
+ <project path="external/apache-qp" name="platform/external/apache-qp" />
<project path="external/astl" name="platform/external/astl" />
<project path="external/bison" name="platform/external/bison" />
<project path="external/blktrace" name="platform/external/blktrace" />
@@ -58,6 +60,8 @@
<project path="external/grub" name="platform/external/grub" />
<project path="external/gtest" name="platform/external/gtest" />
<project path="external/guava" name="platform/external/guava" />
+ <project path="external/harfbuzz" name="platform/external/harfbuzz" />
+ <project path="external/hyphenation" name="platform/external/hyphenation" />
<project path="external/icu4c" name="platform/external/icu4c" />
<project path="external/iproute2" name="platform/external/iproute2" />
<project path="external/ipsec-tools" name="platform/external/ipsec-tools" />
@@ -65,16 +69,22 @@
<project path="external/jdiff" name="platform/external/jdiff" />
<project path="external/jhead" name="platform/external/jhead" />
<project path="external/jpeg" name="platform/external/jpeg" />
+ <project path="external/jsilver" name="platform/external/jsilver" />
<project path="external/jsr305" name="platform/external/jsr305" />
<project path="external/junit" name="platform/external/junit" />
<project path="external/kernel-headers" name="platform/external/kernel-headers" />
<project path="external/libffi" name="platform/external/libffi" />
<project path="external/libgsm" name="platform/external/libgsm" />
+ <project path="external/libmtp" name="platform/external/libmtp" />
<project path="external/libnfc-nxp" name="platform/external/libnfc-nxp" />
<project path="external/libpcap" name="platform/external/libpcap" />
<project path="external/libpng" name="platform/external/libpng" />
+ <project path="external/libusb" name="platform/external/libusb" />
+ <project path="external/libusb-compat" name="platform/external/libusb-compat" />
<project path="external/libvpx" name="platform/external/libvpx" />
<project path="external/libxml2" name="platform/external/libxml2" />
+ <project path="external/libxslt" name="platform/external/libxslt" />
+ <project path="external/mksh" name="platform/external/mksh" />
<project path="external/mtpd" name="platform/external/mtpd" />
<project path="external/netcat" name="platform/external/netcat" />
<project path="external/netperf" name="platform/external/netperf" />
@@ -87,7 +97,7 @@
<project path="external/ppp" name="platform/external/ppp" />
<project path="external/proguard" name="platform/external/proguard" />
<project path="external/protobuf" name="platform/external/protobuf" />
- <project path="external/qemu" name="platform/external/qemu" revision="tools_r7" />
+ <project path="external/qemu" name="platform/external/qemu" />
<project path="external/quake" name="platform/external/quake" />
<project path="external/safe-iop" name="platform/external/safe-iop" />
<project path="external/skia" name="platform/external/skia" />
@@ -103,7 +113,9 @@
<project path="external/tinyxml" name="platform/external/tinyxml" />
<project path="external/tremolo" name="platform/external/tremolo" />
<project path="external/v8" name="platform/external/v8" />
+ <project path="external/valgrind" name="platform/external/valgrind" />
<project path="external/webkit" name="platform/external/webkit" />
+ <project path="external/webp" name="platform/external/webp" />
<project path="external/wpa_supplicant" name="platform/external/wpa_supplicant" />
<project path="external/wpa_supplicant_6" name="platform/external/wpa_supplicant_6" />
<project path="external/xmlwriter" name="platform/external/xmlwriter" />
@@ -111,6 +123,7 @@
<project path="external/zlib" name="platform/external/zlib" />
<project path="frameworks/base" name="platform/frameworks/base" />
<project path="frameworks/ex" name="platform/frameworks/ex" />
+ <project path="frameworks/opt/carddav" name="platform/frameworks/opt/carddav" />
<project path="frameworks/opt/emoji" name="platform/frameworks/opt/emoji" />
<project path="hardware/broadcom/wlan" name="platform/hardware/broadcom/wlan" />
<project path="hardware/libhardware" name="platform/hardware/libhardware" />
@@ -171,7 +184,7 @@
<project path="packages/wallpapers/MagicSmoke" name="platform/packages/wallpapers/MagicSmoke" />
<project path="packages/wallpapers/MusicVisualization" name="platform/packages/wallpapers/MusicVisualization" />
<project path="prebuilt" name="platform/prebuilt" />
- <project path="sdk" name="platform/sdk" revision="tools_r7" />
+ <project path="sdk" name="platform/sdk" />
<project path="system/bluetooth" name="platform/system/bluetooth" />
<project path="system/core" name="platform/system/core" />
<project path="system/extras" name="platform/system/extras" />
@@ -180,4 +193,6 @@
<project path="system/vold" name="platform/system/vold" />
<project path="system/wlan/ti" name="platform/system/wlan/ti" />
+ <project path="tools/tradefederation" name="platform/tools/tradefederation" />
+
</manifest>