diff options
author | Axel Fagerstedt <axel.fagerstedt@linaro.org> | 2013-01-18 10:50:16 +0100 |
---|---|---|
committer | Axel Fagerstedt <axel.fagerstedt@linaro.org> | 2013-01-18 10:50:16 +0100 |
commit | c88667881b7db4ba949f8c9812e2331771256790 (patch) | |
tree | 77b07202e535a128906e4ff7c319682cc9b22d87 /tracking-vexpress.xml | |
parent | e6a6b6d09d0871ff436a02a40f99e5cb8b8f5ad8 (diff) | |
parent | fb36cee7d27c46017271386af7e189aae4791f04 (diff) |
Merge remote-tracking branch 'origin/linaro_android_4.2.1' into HEAD
Diffstat (limited to 'tracking-vexpress.xml')
-rw-r--r-- | tracking-vexpress.xml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tracking-vexpress.xml b/tracking-vexpress.xml index 0f8b8ca..f86bac7 100644 --- a/tracking-vexpress.xml +++ b/tracking-vexpress.xml @@ -20,6 +20,8 @@ <project path="external/lava-blackbox" name="lava-blackbox" remote="zyga" revision="master" /> <!-- Linaro extras --> + <project path="external/thirdparty-benchmarks" name="platform/external/thirdparty-benchmarks" revision="master" /> + <project path="external/linaro-android-tools" name="platform/external/linaro-android-tools" revision="master" /> <project path="packages/apps/DisableSuspend" name="platform/packages/apps/DisableSuspend" revision="master" /> <project path="hardware/samsung/origen/gralloc_ump" name="platform/hardware/samsung/origen/gralloc_ump" revision="linaro_android_4.0.4" /> <project path="hardware/samsung/origen/ump" name="platform/hardware/samsung/origen/ump" revision="linaro_android_4.0.4" /> @@ -29,7 +31,7 @@ <project path="device/linaro/snowball" name="device/linaro/snowball" revision="linaro-jb" /> <project path="device/linaro/vexpress" name="device/linaro/vexpress" revision="linaro-jb" /> <project path="hardware/linaro/tinyhal" name="platform/hardware/linaro/tinyhal" revision="linaro-jellybean" /> - <project path="external/busybox" name="platform/external/busybox" revision="linaro-1.19" /> + <project path="external/busybox" name="platform/external/busybox" revision="linaro-1.20" /> <project path="external/lrzsz" name="platform/external/lrzsz" revision="linaro-master" /> <project path="external/x264" name="platform/external/x264" revision="linaro-master" /> <project path="external/ffmpeg" name="platform/external/ffmpeg" revision="linaro-1.0.1" /> |