diff options
author | Mathieu Poirier <mathieu.poirier@linaro.org> | 2011-09-20 21:53:44 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@betelgeuse.canonical.com> | 2011-09-20 21:53:44 +0000 |
commit | 5d38f13bf0aeda8dad43c4de742f4a2fb2ac783d (patch) | |
tree | e04753ff2e79534759d0fb9df111a12ebc3334e5 | |
parent | c1c999294e24a97466b4a863a96dc09d8c389088 (diff) | |
parent | 4b85d4da1f284c483e0f3e78d4ebf037961f0a69 (diff) | |
download | manifest-5d38f13bf0aeda8dad43c4de742f4a2fb2ac783d.tar.gz |
Merge "Switch busybox to linaro_android_2.3.5 branch." into linaro_android_2.3.5
-rw-r--r-- | LEB-iMX53.xml | 2 | ||||
-rw-r--r-- | LEB-panda.xml | 2 | ||||
-rw-r--r-- | LEB-snowball.xml | 2 | ||||
-rw-r--r-- | default.xml | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/LEB-iMX53.xml b/LEB-iMX53.xml index df3da2513..45d14da2b 100644 --- a/LEB-iMX53.xml +++ b/LEB-iMX53.xml @@ -45,7 +45,7 @@ <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.4" remote="linaro-android" /> + <project path="external/busybox" name="platform/external/busybox" revision="linaro_android_2.3.5" remote="linaro-android" /> <project path="external/stlport" name="platform/external/stlport" 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" /> diff --git a/LEB-panda.xml b/LEB-panda.xml index d2257d661..88a4ae05b 100644 --- a/LEB-panda.xml +++ b/LEB-panda.xml @@ -42,7 +42,7 @@ <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.4" remote="linaro-android" /> + <project path="external/busybox" name="platform/external/busybox" revision="linaro_android_2.3.5" remote="linaro-android" /> <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_2.3.5" remote="linaro-android" /> <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" revision="linaro_android_2.3.5" remote="linaro-android" /> <project path="external/wpa_supplicant_6" name="platform/external/wpa_supplicant_6" revision="linaro_android_2.3.5" remote="linaro-android"/> diff --git a/LEB-snowball.xml b/LEB-snowball.xml index 41f2603ef..9d37b2688 100644 --- a/LEB-snowball.xml +++ b/LEB-snowball.xml @@ -42,7 +42,7 @@ <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.4" remote="linaro-android" /> + <project path="external/busybox" name="platform/external/busybox" revision="linaro_android_2.3.5" remote="linaro-android" /> <project path="external/stlport" name="platform/external/stlport" 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" /> diff --git a/default.xml b/default.xml index f41f6748b..f24dc8fb8 100644 --- a/default.xml +++ b/default.xml @@ -42,7 +42,7 @@ <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.4" remote="linaro-android" /> + <project path="external/busybox" name="platform/external/busybox" revision="linaro_android_2.3.5" remote="linaro-android" /> <project path="external/stlport" name="platform/external/stlport" 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" /> |