diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2011-05-12 15:20:22 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2011-05-12 15:20:43 -0700 |
| commit | 84f29d648142f173dafefb5a619c60bb0ee4718d (patch) | |
| tree | 6ac232f779b3e6eb44b911fcf08b226a1b24f4aa | |
| parent | 0d2de63f82bbea8d670a2e75ab5254cec48a7f4a (diff) | |
| parent | 16c4653b43e5f1b542b4cd229b44f4ea89b98e0f (diff) | |
| download | manifest-84f29d648142f173dafefb5a619c60bb0ee4718d.tar.gz | |
merge from master
| -rw-r--r-- | default.xml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/default.xml b/default.xml index a71ae7afc..c17ef91b0 100644 --- a/default.xml +++ b/default.xml @@ -17,12 +17,16 @@ <project path="dalvik" name="platform/dalvik" /> <project path="development" name="platform/development" /> <project path="device/common" name="device/common" /> + <project path="device/google/accessory/arduino" name="device/google/accessory/arduino" /> + <project path="device/google/accessory/demokit" name="device/google/accessory/demokit" /> <project path="device/htc/common" name="device/htc/common" /> <project path="device/htc/passion" name="device/htc/passion" /> <project path="device/htc/passion-common" name="device/htc/passion-common" /> <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="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" /> @@ -105,6 +109,7 @@ <project path="external/tremolo" name="platform/external/tremolo" /> <project path="external/v8" name="platform/external/v8" /> <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" /> @@ -112,6 +117,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" /> |