diff options
author | Vishal Bhoj <vishal.bhoj@linaro.org> | 2012-01-18 23:16:46 +0530 |
---|---|---|
committer | Vishal Bhoj <vishal.bhoj@linaro.org> | 2012-01-18 23:16:46 +0530 |
commit | 1d20f7111884ab011ecdce146ee6aa50c475e069 (patch) | |
tree | 4b3399bac1a1790cd7a45c906b811862669e6562 | |
parent | 810e0077d9994f2d68d63194753f557a634d070f (diff) | |
parent | 3b6bfd8b9c164b1925b236999576b0d354fcf987 (diff) | |
download | manifest-1d20f7111884ab011ecdce146ee6aa50c475e069.tar.gz |
Merge branch 'master' into linaro_android_master
-rw-r--r-- | default.xml | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/default.xml b/default.xml index ae6e196a2..7f392d014 100644 --- a/default.xml +++ b/default.xml @@ -2,7 +2,8 @@ <manifest> <remote name="aosp" - fetch=".." /> + fetch=".." + review="https://android-review.googlesource.com/" /> <default revision="master" remote="aosp" sync-j="4" /> @@ -35,8 +36,14 @@ <project path="device/generic/goldfish" name="device/generic/goldfish" /> <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/moto/common" name="device/moto/common" /> + <project path="device/moto/stingray" name="device/moto/stingray" /> + <project path="device/moto/wingray" name="device/moto/wingray" /> <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="device/samsung/maguro" name="device/samsung/maguro" /> + <project path="device/samsung/toro" name="device/samsung/toro" /> <project path="device/samsung/tuna" name="device/samsung/tuna" /> <project path="docs/source.android.com" name="platform/docs/source.android.com" /> <project path="external/android-mock" name="platform/external/android-mock" /> @@ -109,6 +116,7 @@ <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/libyuv" name="platform/external/libyuv" /> <project path="external/llvm" name="platform/external/llvm" /> <project path="external/lohit-fonts" name="platform/external/lohit-fonts" /> <project path="external/markdown" name="platform/external/markdown" /> @@ -242,6 +250,8 @@ <project path="packages/wallpapers/NoiseField" name="platform/packages/wallpapers/NoiseField" /> <project path="packages/wallpapers/PhaseBeam" name="platform/packages/wallpapers/PhaseBeam" /> <project path="prebuilt" name="platform/prebuilt" /> + <project path="prebuilts/qemu-kernel" name="platform/prebuilts/qemu-kernel" /> + <project path="prebuilts/tools" name="platform/prebuilts/tools" /> <project path="sdk" name="platform/sdk" /> <project path="system/bluetooth" name="platform/system/bluetooth" /> <project path="system/core" name="platform/system/core" /> |