From 2df006018e300274393130b78d86310c78faf461 Mon Sep 17 00:00:00 2001
From: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
Date: Fri, 4 May 2012 13:40:08 +0200
Subject: manifest: (All) Use the right branch of system/media

Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
---
 default.xml                   | 2 +-
 fsl-iMX6.xml                  | 2 +-
 landing-panda.xml             | 2 +-
 landing-snowball.xml          | 2 +-
 maguro.xml                    | 2 +-
 staging-iMX53.xml             | 2 +-
 staging-iMX6.xml              | 2 +-
 staging-origen.xml            | 2 +-
 staging-panda.xml             | 2 +-
 staging-vexpress-rtsm-isw.xml | 2 +-
 staging-vexpress-rtsm.xml     | 2 +-
 staging-vexpress.xml          | 2 +-
 tracking-origen.xml           | 2 +-
 tracking-panda.xml            | 2 +-
 tracking-snowball.xml         | 2 +-
 tracking-vexpress.xml         | 2 +-
 16 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/default.xml b/default.xml
index 6300370c8..7b68eb2cf 100644
--- a/default.xml
+++ b/default.xml
@@ -80,6 +80,7 @@
   <project name="people/afrantzis/glmark2" path="packages/apps/glmark2" remote="linaro-other" revision="master"/>
   <project path="cts" name="platform/cts" revision="linaro_android_4.0.4" />
   <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" revision="linaro_android_4.0.4" />
+  <project path="system/media" name="platform/system/media" revision="linaro_android_4.0.4" />
 
   <!-- TI proprietary-open -->
   <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
@@ -276,7 +277,6 @@
   <project path="sdk" name="platform/sdk" />
   <project path="system/bluetooth" name="platform/system/bluetooth" />
   <project path="system/extras" name="platform/system/extras" />
-  <project path="system/media" name="platform/system/media" />
   <project path="system/netd" name="platform/system/netd" />
 
 </manifest>
diff --git a/fsl-iMX6.xml b/fsl-iMX6.xml
index f0cedebda..0d68ff78b 100644
--- a/fsl-iMX6.xml
+++ b/fsl-iMX6.xml
@@ -87,6 +87,7 @@
   <project path="cts" name="platform/cts" revision="linaro_android_4.0.4" />
   <project path="external/gtest" name="platform/external/gtest" revision="linaro_android_4.0.4" />
   <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" revision="linaro_android_4.0.4"/>
+  <project path="system/media" name="platform/system/media" revision="linaro_android_4.0.4" />
 
   <!-- TI proprietary-open -->
   <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
@@ -283,7 +284,6 @@
   <project path="sdk" name="platform/sdk" />
   <project path="system/bluetooth" name="platform/system/bluetooth" />
   <project path="system/extras" name="platform/system/extras" />
-  <project path="system/media" name="platform/system/media" />
   <project path="system/netd" name="platform/system/netd" />
 
 </manifest>
diff --git a/landing-panda.xml b/landing-panda.xml
index 20c064d8f..e040f8352 100644
--- a/landing-panda.xml
+++ b/landing-panda.xml
@@ -87,6 +87,7 @@
   <project path="cts" name="platform/cts" revision="linaro_android_4.0.4" />
   <project path="external/gtest" name="platform/external/gtest" revision="linaro_android_4.0.4" />
   <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" revision="linaro_android_4.0.4" />
+  <project path="system/media" name="platform/system/media" revision="linaro_android_4.0.4" />
 
   <!-- TI proprietary-open -->
   <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
@@ -286,7 +287,6 @@
   <project path="sdk" name="platform/sdk" />
   <project path="system/bluetooth" name="platform/system/bluetooth" />
   <project path="system/extras" name="platform/system/extras" />
-  <project path="system/media" name="platform/system/media" />
   <project path="system/netd" name="platform/system/netd" />
 
 </manifest>
diff --git a/landing-snowball.xml b/landing-snowball.xml
index 905b73d9b..c512d3bb0 100644
--- a/landing-snowball.xml
+++ b/landing-snowball.xml
@@ -89,6 +89,7 @@
   <project path="cts" name="platform/cts" revision="linaro_android_4.0.4" />
   <project path="external/gtest" name="platform/external/gtest" revision="linaro_android_4.0.4" />
   <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" revision="linaro_android_4.0.4"/>
+  <project path="system/media" name="platform/system/media" revision="linaro_android_4.0.4" />
 
   <!-- TI proprietary-open -->
   <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
@@ -285,7 +286,6 @@
   <project path="sdk" name="platform/sdk" />
   <project path="system/bluetooth" name="platform/system/bluetooth" />
   <project path="system/extras" name="platform/system/extras" />
-  <project path="system/media" name="platform/system/media" />
   <project path="system/netd" name="platform/system/netd" />
 
 </manifest>
diff --git a/maguro.xml b/maguro.xml
index b49e0c5a0..517d4d3bd 100644
--- a/maguro.xml
+++ b/maguro.xml
@@ -249,7 +249,7 @@
   <project path="system/bluetooth" name="platform/system/bluetooth" />
   <project path="system/core" name="platform/system/core" revision="linaro_android_4.0.4" />
   <project path="system/extras" name="platform/system/extras" />
-  <project path="system/media" name="platform/system/media" />
+  <project path="system/media" name="platform/system/media" revision="linaro_android_4.0.4" />
   <project path="system/netd" name="platform/system/netd" />
   <project path="system/vold" name="platform/system/vold" revision="linaro_android_4.0.4" />
 
diff --git a/staging-iMX53.xml b/staging-iMX53.xml
index 8988a1028..1fa83450a 100644
--- a/staging-iMX53.xml
+++ b/staging-iMX53.xml
@@ -85,6 +85,7 @@
   <project path="cts" name="platform/cts" revision="linaro_android_4.0.4" />
   <project path="external/gtest" name="platform/external/gtest" revision="linaro_android_4.0.4" />
   <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" revision="linaro_android_4.0.4"/>
+  <project path="system/media" name="platform/system/media" revision="linaro_android_4.0.4" />
 
   <!-- TI proprietary-open -->
   <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
@@ -281,7 +282,6 @@
   <project path="sdk" name="platform/sdk" />
   <project path="system/bluetooth" name="platform/system/bluetooth" />
   <project path="system/extras" name="platform/system/extras" />
-  <project path="system/media" name="platform/system/media" />
   <project path="system/netd" name="platform/system/netd" />
 
 </manifest>
diff --git a/staging-iMX6.xml b/staging-iMX6.xml
index 55b2abcde..e4b11403d 100644
--- a/staging-iMX6.xml
+++ b/staging-iMX6.xml
@@ -87,6 +87,7 @@
   <project path="cts" name="platform/cts" revision="linaro_android_4.0.4" />
   <project path="external/gtest" name="platform/external/gtest" revision="linaro_android_4.0.4" />
   <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" revision="linaro_android_4.0.4"/>
+  <project path="system/media" name="platform/system/media" revision="linaro_android_4.0.4" />
 
   <!-- TI proprietary-open -->
   <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
@@ -283,7 +284,6 @@
   <project path="sdk" name="platform/sdk" />
   <project path="system/bluetooth" name="platform/system/bluetooth" />
   <project path="system/extras" name="platform/system/extras" />
-  <project path="system/media" name="platform/system/media" />
   <project path="system/netd" name="platform/system/netd" />
 
 </manifest>
diff --git a/staging-origen.xml b/staging-origen.xml
index e1eb56d52..2dd2895a0 100644
--- a/staging-origen.xml
+++ b/staging-origen.xml
@@ -90,6 +90,7 @@
   <project path="cts" name="platform/cts" revision="linaro_android_4.0.4" />
   <project path="external/gtest" name="platform/external/gtest" revision="linaro_android_4.0.4" />
   <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" revision="linaro_android_4.0.4"/>
+  <project path="system/media" name="platform/system/media" revision="linaro_android_4.0.4" />
 
   <!-- TI proprietary-open -->
   <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
@@ -285,7 +286,6 @@
   <project path="prebuilt" name="platform/prebuilt" />
   <project path="sdk" name="platform/sdk" />
   <project path="system/extras" name="platform/system/extras" />
-  <project path="system/media" name="platform/system/media" />
   <project path="system/netd" name="platform/system/netd" />
 
 </manifest>
diff --git a/staging-panda.xml b/staging-panda.xml
index 6ef38397c..7611d4301 100644
--- a/staging-panda.xml
+++ b/staging-panda.xml
@@ -84,6 +84,7 @@
   <project path="cts" name="platform/cts" revision="linaro_android_4.0.4" />
   <project path="external/gtest" name="platform/external/gtest" revision="linaro_android_4.0.4" />
   <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" revision="linaro_android_4.0.4" />
+  <project path="system/media" name="platform/system/media" revision="linaro_android_4.0.4" />
 
   <!-- TI proprietary-open -->
   <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
@@ -280,7 +281,6 @@
   <project path="sdk" name="platform/sdk" />
   <project path="system/bluetooth" name="platform/system/bluetooth" />
   <project path="system/extras" name="platform/system/extras" />
-  <project path="system/media" name="platform/system/media" />
   <project path="system/netd" name="platform/system/netd" />
 
 </manifest>
diff --git a/staging-vexpress-rtsm-isw.xml b/staging-vexpress-rtsm-isw.xml
index fb30683e4..9a607c411 100644
--- a/staging-vexpress-rtsm-isw.xml
+++ b/staging-vexpress-rtsm-isw.xml
@@ -91,6 +91,7 @@
   <project path="cts" name="platform/cts" revision="linaro_android_4.0.4" />
   <project path="external/gtest" name="platform/external/gtest" revision="linaro_android_4.0.4" />
   <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" revision="linaro_android_4.0.4"/>
+  <project path="system/media" name="platform/system/media" revision="linaro_android_4.0.4" />
 
   <!-- TI proprietary-open -->
   <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
@@ -287,7 +288,6 @@
   <project path="sdk" name="platform/sdk" />
   <project path="system/bluetooth" name="platform/system/bluetooth" />
   <project path="system/extras" name="platform/system/extras" />
-  <project path="system/media" name="platform/system/media" />
   <project path="system/netd" name="platform/system/netd" />
 
 </manifest>
diff --git a/staging-vexpress-rtsm.xml b/staging-vexpress-rtsm.xml
index 4f8e7e260..125cf6fe6 100644
--- a/staging-vexpress-rtsm.xml
+++ b/staging-vexpress-rtsm.xml
@@ -90,6 +90,7 @@
   <project path="cts" name="platform/cts" revision="linaro_android_4.0.4" />
   <project path="external/gtest" name="platform/external/gtest" revision="linaro_android_4.0.4" />
   <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" revision="linaro_android_4.0.4"/>
+  <project path="system/media" name="platform/system/media" revision="linaro_android_4.0.4" />
 
   <!-- TI proprietary-open -->
   <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
@@ -286,7 +287,6 @@
   <project path="sdk" name="platform/sdk" />
   <project path="system/bluetooth" name="platform/system/bluetooth" />
   <project path="system/extras" name="platform/system/extras" />
-  <project path="system/media" name="platform/system/media" />
   <project path="system/netd" name="platform/system/netd" />
 
 </manifest>
diff --git a/staging-vexpress.xml b/staging-vexpress.xml
index 6c1ad2766..ba5f08395 100644
--- a/staging-vexpress.xml
+++ b/staging-vexpress.xml
@@ -86,6 +86,7 @@
   <project path="cts" name="platform/cts" revision="linaro_android_4.0.4" />
   <project path="external/gtest" name="platform/external/gtest" revision="linaro_android_4.0.4" />
   <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" revision="linaro_android_4.0.4"/>
+  <project path="system/media" name="platform/system/media" revision="linaro_android_4.0.4" />
 
   <!-- TI proprietary-open -->
   <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
@@ -282,7 +283,6 @@
   <project path="sdk" name="platform/sdk" />
   <project path="system/bluetooth" name="platform/system/bluetooth" />
   <project path="system/extras" name="platform/system/extras" />
-  <project path="system/media" name="platform/system/media" />
   <project path="system/netd" name="platform/system/netd" />
 
 </manifest>
diff --git a/tracking-origen.xml b/tracking-origen.xml
index ebfc28006..d09b21e48 100644
--- a/tracking-origen.xml
+++ b/tracking-origen.xml
@@ -90,6 +90,7 @@
   <project path="cts" name="platform/cts" revision="linaro_android_4.0.4" />
   <project path="external/gtest" name="platform/external/gtest" revision="linaro_android_4.0.4" />
   <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" revision="linaro_android_4.0.4"/>
+  <project path="system/media" name="platform/system/media" revision="linaro_android_4.0.4" />
 
   <!-- TI proprietary-open -->
   <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
@@ -285,7 +286,6 @@
   <project path="prebuilt" name="platform/prebuilt" />
   <project path="sdk" name="platform/sdk" />
   <project path="system/extras" name="platform/system/extras" />
-  <project path="system/media" name="platform/system/media" />
   <project path="system/netd" name="platform/system/netd" />
 
 </manifest>
diff --git a/tracking-panda.xml b/tracking-panda.xml
index eee47317e..f8b690c6c 100644
--- a/tracking-panda.xml
+++ b/tracking-panda.xml
@@ -84,6 +84,7 @@
   <project path="cts" name="platform/cts" revision="linaro_android_4.0.4" />
   <project path="external/gtest" name="platform/external/gtest" revision="linaro_android_4.0.4" />
   <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" revision="linaro_android_4.0.4"/>
+  <project path="system/media" name="platform/system/media" revision="linaro_android_4.0.4" />
 
   <!-- TI proprietary-open -->
   <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
@@ -280,7 +281,6 @@
   <project path="sdk" name="platform/sdk" />
   <project path="system/bluetooth" name="platform/system/bluetooth" />
   <project path="system/extras" name="platform/system/extras" />
-  <project path="system/media" name="platform/system/media" />
   <project path="system/netd" name="platform/system/netd" />
 
 </manifest>
diff --git a/tracking-snowball.xml b/tracking-snowball.xml
index d8ef5cadf..77bc8eb7e 100644
--- a/tracking-snowball.xml
+++ b/tracking-snowball.xml
@@ -89,6 +89,7 @@
   <project path="cts" name="platform/cts" revision="linaro_android_4.0.4" />
   <project path="external/gtest" name="platform/external/gtest" revision="linaro_android_4.0.4" />
   <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" revision="linaro_android_4.0.4"/>
+  <project path="system/media" name="platform/system/media" revision="linaro_android_4.0.4" />
 
   <!-- TI proprietary-open -->
   <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
@@ -285,7 +286,6 @@
   <project path="sdk" name="platform/sdk" />
   <project path="system/bluetooth" name="platform/system/bluetooth" />
   <project path="system/extras" name="platform/system/extras" />
-  <project path="system/media" name="platform/system/media" />
   <project path="system/netd" name="platform/system/netd" />
 
 </manifest>
diff --git a/tracking-vexpress.xml b/tracking-vexpress.xml
index e7764f0c5..1de71ece9 100644
--- a/tracking-vexpress.xml
+++ b/tracking-vexpress.xml
@@ -86,6 +86,7 @@
   <project path="cts" name="platform/cts" revision="linaro_android_4.0.4" />
   <project path="external/gtest" name="platform/external/gtest" revision="linaro_android_4.0.4" />
   <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" revision="linaro_android_4.0.4"/>
+  <project path="system/media" name="platform/system/media" revision="linaro_android_4.0.4" />
 
   <!-- TI proprietary-open -->
   <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
@@ -282,7 +283,6 @@
   <project path="sdk" name="platform/sdk" />
   <project path="system/bluetooth" name="platform/system/bluetooth" />
   <project path="system/extras" name="platform/system/extras" />
-  <project path="system/media" name="platform/system/media" />
   <project path="system/netd" name="platform/system/netd" />
 
 </manifest>
-- 
cgit v1.2.3