Merge branch 'linaro_android_4.0.3' of git://android.git.linaro.org/platform/manifest into linaro_android_4.0.3

10 files changed, 10 insertions, 10 deletions

diff --git a/default.xml b/default.xml
index bfd805842..a8c934856 100644
--- a/default.xml
+++ b/default.xml
@@ -24,7 +24,7 @@
   <project path="external/busybox" name="platform/external/busybox" revision="linaro_android_4.0.3" />
   <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-0.9" />
+  <project path="external/ffmpeg" name="platform/external/ffmpeg" revision="linaro-0.10" />
   <project path="external/speex" name="platform/external/speex" revision="linaro_mmwg" />
   <project path="u-boot" name="boot/u-boot-linaro-stable" revision="master" remote="linaro-other" />
   <project path="external/gator" name="arm/ds5/gator" revision="android" remote="linaro-other" />
diff --git a/landing-panda.xml b/landing-panda.xml
index 581b5d75d..f3344318c 100644
--- a/landing-panda.xml
+++ b/landing-panda.xml
@@ -28,7 +28,7 @@
   <project path="external/busybox" name="platform/external/busybox" revision="linaro_android_4.0.3" />
   <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-0.9" />
+  <project path="external/ffmpeg" name="platform/external/ffmpeg" revision="linaro-0.10" />
   <project path="external/speex" name="platform/external/speex" revision="linaro_mmwg" />
   <project path="u-boot" name="boot/u-boot-linaro-stable" revision="master" remote="linaro-other" />
   <project path="external/gator" name="arm/ds5/gator" revision="android" remote="linaro-other" />
diff --git a/landing-snowball.xml b/landing-snowball.xml
index 2a56d2009..90819a969 100644
--- a/landing-snowball.xml
+++ b/landing-snowball.xml
@@ -28,7 +28,7 @@
   <project path="external/busybox" name="platform/external/busybox" revision="linaro_android_4.0.3" />
   <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-0.9" />
+  <project path="external/ffmpeg" name="platform/external/ffmpeg" revision="linaro-0.10" />
   <project path="external/speex" name="platform/external/speex" revision="linaro_mmwg" />
   <project path="u-boot" name="git/boot/u-boot-ux500" revision="master" remote="igloocommunity" />
   <project path="external/gator" name="arm/ds5/gator" revision="android" remote="linaro-other" />
diff --git a/staging-iMX53.xml b/staging-iMX53.xml
index ae7191736..74c9e56a9 100644
--- a/staging-iMX53.xml
+++ b/staging-iMX53.xml
@@ -25,7 +25,7 @@
   <project path="external/busybox" name="platform/external/busybox" revision="linaro_android_4.0.3" />
   <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-0.9" />
+  <project path="external/ffmpeg" name="platform/external/ffmpeg" revision="linaro-0.10" />
   <project path="external/speex" name="platform/external/speex" revision="linaro_mmwg" />
   <project path="u-boot" name="boot/u-boot-linaro-stable" revision="master" remote="linaro-other" />
   <project path="external/gator" name="arm/ds5/gator" revision="android" remote="linaro-other" />
diff --git a/staging-iMX6.xml b/staging-iMX6.xml
index e69135f6f..2a6e8bc3a 100644
--- a/staging-iMX6.xml
+++ b/staging-iMX6.xml
@@ -25,7 +25,7 @@
   <project path="external/busybox" name="platform/external/busybox" revision="linaro_android_4.0.3" />
   <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-0.9" />
+  <project path="external/ffmpeg" name="platform/external/ffmpeg" revision="linaro-0.10" />
   <project path="external/speex" name="platform/external/speex" revision="linaro_mmwg" />
   <!-- iMX6 needs a special u-boot for the time being... -->
   <!-- project path="u-boot" name="boot/u-boot-linaro-stable" revision="master" remote="linaro-other" / -->
diff --git a/staging-origen.xml b/staging-origen.xml
index db6dad93a..9178f967e 100644
--- a/staging-origen.xml
+++ b/staging-origen.xml
@@ -28,7 +28,7 @@
   <project path="external/busybox" name="platform/external/busybox" revision="linaro_android_4.0.3" />
   <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-0.9" />
+  <project path="external/ffmpeg" name="platform/external/ffmpeg" revision="linaro-0.10" />
   <project path="external/speex" name="platform/external/speex" revision="linaro_mmwg" />
   <project path="device/samsung/proprietary-open" name="device/samsung/proprietary-open" revision="linaro_android_4.0.3" remote="linaro-android" />
   <project path="u-boot" name="people/angus/u-boot" revision="origen" remote="linaro-other"/>
diff --git a/staging-panda.xml b/staging-panda.xml
index 4b2906ca6..f784497c4 100644
--- a/staging-panda.xml
+++ b/staging-panda.xml
@@ -24,7 +24,7 @@
   <project path="external/busybox" name="platform/external/busybox" revision="linaro_android_4.0.3" />
   <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-0.9" />
+  <project path="external/ffmpeg" name="platform/external/ffmpeg" revision="linaro-0.10" />
   <project path="external/speex" name="platform/external/speex" revision="linaro_mmwg" />
   <project path="u-boot" name="boot/u-boot-linaro-stable" revision="master" remote="linaro-other" />
   <project path="external/gator" name="arm/ds5/gator" revision="android" remote="linaro-other" />
diff --git a/staging-snowball.xml b/staging-snowball.xml
index 2cd373952..f715457ba 100644
--- a/staging-snowball.xml
+++ b/staging-snowball.xml
@@ -28,7 +28,7 @@
   <project path="external/busybox" name="platform/external/busybox" revision="linaro_android_4.0.3" />
   <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-0.9" />
+  <project path="external/ffmpeg" name="platform/external/ffmpeg" revision="linaro-0.10" />
   <project path="external/speex" name="platform/external/speex" revision="linaro_mmwg" />
   <project path="u-boot" name="git/boot/u-boot-ux500" revision="master" remote="igloocommunity" />
   <project path="external/gator" name="arm/ds5/gator" revision="android" remote="linaro-other" />
diff --git a/staging-vexpress-a9.xml b/staging-vexpress-a9.xml
index 38c6cced9..cb6b73b7f 100644
--- a/staging-vexpress-a9.xml
+++ b/staging-vexpress-a9.xml
@@ -26,7 +26,7 @@
   <project path="external/busybox" name="platform/external/busybox" revision="linaro_android_4.0.3" />
   <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-0.9" />
+  <project path="external/ffmpeg" name="platform/external/ffmpeg" revision="linaro-0.10" />
   <project path="external/speex" name="platform/external/speex" revision="linaro_mmwg" />
   <project path="u-boot" name="people/tixy/u-boot" revision="vexpress-hacks" remote="linaro-other" />
   <project path="uefi" name="arm/uefi/uefi" revision="master" remote="linaro-other" />
diff --git a/tracking-panda.xml b/tracking-panda.xml
index 1358380a8..195bd2c70 100644
--- a/tracking-panda.xml
+++ b/tracking-panda.xml
@@ -24,7 +24,7 @@
   <project path="external/busybox" name="platform/external/busybox" revision="linaro_android_4.0.3" />
   <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-0.9" />
+  <project path="external/ffmpeg" name="platform/external/ffmpeg" revision="linaro-0.10" />
   <project path="external/speex" name="platform/external/speex" revision="linaro_mmwg" />
   <project path="u-boot" name="boot/u-boot-linaro-stable" revision="master" remote="linaro-other" />
   <project path="external/gator" name="arm/ds5/gator" revision="android" remote="linaro-other" />