From 855fbfbe471eda308ce8ed05a5893c77c4975f18 Mon Sep 17 00:00:00 2001
From: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
Date: Mon, 21 May 2012 23:12:44 +0200
Subject: manifest: (All) use linaro branch of Camera

The Linaro branch contains ISO C++ 11 fixes.

Change-Id: I69a986f24439cfe5f4c91e18348a9d3bd75fa6cc
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
---
 default.xml                   | 2 +-
 fsl-iMX6.xml                  | 2 +-
 landing-panda.xml             | 2 +-
 landing-snowball.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 +-
 15 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/default.xml b/default.xml
index 41b5953..39e07a9 100644
--- a/default.xml
+++ b/default.xml
@@ -88,6 +88,7 @@
   <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.0.4" />
   <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.0.4" />
   <project path="external/strace" name="platform/external/strace" revision="linaro_android_4.0.4" />
+  <project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="linaro_android_4.0.4" />
 
   <!-- TI proprietary-open -->
   <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
@@ -225,7 +226,6 @@
   <project path="packages/apps/Browser" name="platform/packages/apps/Browser" />
   <project path="packages/apps/Calculator" name="platform/packages/apps/Calculator" />
   <project path="packages/apps/Calendar" name="platform/packages/apps/Calendar" />
-  <project path="packages/apps/Camera" name="platform/packages/apps/Camera" />
   <project path="packages/apps/CellBroadcastReceiver" name="platform/packages/apps/CellBroadcastReceiver" />
   <project path="packages/apps/CertInstaller" name="platform/packages/apps/CertInstaller" />
   <project path="packages/apps/Contacts" name="platform/packages/apps/Contacts" />
diff --git a/fsl-iMX6.xml b/fsl-iMX6.xml
index 6fd6023..64bb695 100644
--- a/fsl-iMX6.xml
+++ b/fsl-iMX6.xml
@@ -95,6 +95,7 @@
   <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.0.4" />
   <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.0.4" />
   <project path="external/strace" name="platform/external/strace" revision="linaro_android_4.0.4" />
+  <project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="linaro_android_4.0.4" />
 
   <!-- TI proprietary-open -->
   <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
@@ -232,7 +233,6 @@
   <project path="packages/apps/Browser" name="platform/packages/apps/Browser" />
   <project path="packages/apps/Calculator" name="platform/packages/apps/Calculator" />
   <project path="packages/apps/Calendar" name="platform/packages/apps/Calendar" />
-  <project path="packages/apps/Camera" name="platform/packages/apps/Camera" />
   <project path="packages/apps/CellBroadcastReceiver" name="platform/packages/apps/CellBroadcastReceiver" />
   <project path="packages/apps/CertInstaller" name="platform/packages/apps/CertInstaller" />
   <project path="packages/apps/Contacts" name="platform/packages/apps/Contacts" />
diff --git a/landing-panda.xml b/landing-panda.xml
index f1281fb..9cd8267 100644
--- a/landing-panda.xml
+++ b/landing-panda.xml
@@ -95,6 +95,7 @@
   <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.0.4" />
   <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.0.4" />
   <project path="external/strace" name="platform/external/strace" revision="linaro_android_4.0.4" />
+  <project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="linaro_android_4.0.4" />
 
   <!-- TI proprietary-open -->
   <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
@@ -235,7 +236,6 @@
   <project path="packages/apps/Browser" name="platform/packages/apps/Browser" />
   <project path="packages/apps/Calculator" name="platform/packages/apps/Calculator" />
   <project path="packages/apps/Calendar" name="platform/packages/apps/Calendar" />
-  <project path="packages/apps/Camera" name="platform/packages/apps/Camera" />
   <project path="packages/apps/CellBroadcastReceiver" name="platform/packages/apps/CellBroadcastReceiver" />
   <project path="packages/apps/CertInstaller" name="platform/packages/apps/CertInstaller" />
   <project path="packages/apps/Contacts" name="platform/packages/apps/Contacts" />
diff --git a/landing-snowball.xml b/landing-snowball.xml
index 85625c0..3b2ac30 100644
--- a/landing-snowball.xml
+++ b/landing-snowball.xml
@@ -99,6 +99,7 @@
   <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.0.4" />
   <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.0.4" />
   <project path="external/strace" name="platform/external/strace" revision="linaro_android_4.0.4" />
+  <project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="linaro_android_4.0.4" />
 
   <!-- TI proprietary-open -->
   <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
@@ -235,7 +236,6 @@
   <project path="packages/apps/Browser" name="platform/packages/apps/Browser" />
   <project path="packages/apps/Calculator" name="platform/packages/apps/Calculator" />
   <project path="packages/apps/Calendar" name="platform/packages/apps/Calendar" />
-  <project path="packages/apps/Camera" name="platform/packages/apps/Camera" />
   <project path="packages/apps/CellBroadcastReceiver" name="platform/packages/apps/CellBroadcastReceiver" />
   <project path="packages/apps/CertInstaller" name="platform/packages/apps/CertInstaller" />
   <project path="packages/apps/Contacts" name="platform/packages/apps/Contacts" />
diff --git a/staging-iMX53.xml b/staging-iMX53.xml
index 4205baa..e9e6d33 100644
--- a/staging-iMX53.xml
+++ b/staging-iMX53.xml
@@ -93,6 +93,7 @@
   <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.0.4" />
   <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.0.4" />
   <project path="external/strace" name="platform/external/strace" revision="linaro_android_4.0.4" />
+  <project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="linaro_android_4.0.4" />
 
   <!-- TI proprietary-open -->
   <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
@@ -230,7 +231,6 @@
   <project path="packages/apps/Browser" name="platform/packages/apps/Browser" />
   <project path="packages/apps/Calculator" name="platform/packages/apps/Calculator" />
   <project path="packages/apps/Calendar" name="platform/packages/apps/Calendar" />
-  <project path="packages/apps/Camera" name="platform/packages/apps/Camera" />
   <project path="packages/apps/CellBroadcastReceiver" name="platform/packages/apps/CellBroadcastReceiver" />
   <project path="packages/apps/CertInstaller" name="platform/packages/apps/CertInstaller" />
   <project path="packages/apps/Contacts" name="platform/packages/apps/Contacts" />
diff --git a/staging-iMX6.xml b/staging-iMX6.xml
index 81b6e92..6a4c4e7 100644
--- a/staging-iMX6.xml
+++ b/staging-iMX6.xml
@@ -95,6 +95,7 @@
   <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.0.4" />
   <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.0.4" />
   <project path="external/strace" name="platform/external/strace" revision="linaro_android_4.0.4" />
+  <project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="linaro_android_4.0.4" />
 
   <!-- TI proprietary-open -->
   <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
@@ -232,7 +233,6 @@
   <project path="packages/apps/Browser" name="platform/packages/apps/Browser" />
   <project path="packages/apps/Calculator" name="platform/packages/apps/Calculator" />
   <project path="packages/apps/Calendar" name="platform/packages/apps/Calendar" />
-  <project path="packages/apps/Camera" name="platform/packages/apps/Camera" />
   <project path="packages/apps/CellBroadcastReceiver" name="platform/packages/apps/CellBroadcastReceiver" />
   <project path="packages/apps/CertInstaller" name="platform/packages/apps/CertInstaller" />
   <project path="packages/apps/Contacts" name="platform/packages/apps/Contacts" />
diff --git a/staging-origen.xml b/staging-origen.xml
index a8ba76f..cf449b0 100644
--- a/staging-origen.xml
+++ b/staging-origen.xml
@@ -97,6 +97,7 @@
   <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.0.4" />
   <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.0.4" />
   <project path="external/strace" name="platform/external/strace" revision="linaro_android_4.0.4" />
+  <project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="linaro_android_4.0.4" />
 
   <!-- TI proprietary-open -->
   <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
@@ -234,7 +235,6 @@
   <project path="packages/apps/Browser" name="platform/packages/apps/Browser" />
   <project path="packages/apps/Calculator" name="platform/packages/apps/Calculator" />
   <project path="packages/apps/Calendar" name="platform/packages/apps/Calendar" />
-  <project path="packages/apps/Camera" name="platform/packages/apps/Camera" />
   <project path="packages/apps/CellBroadcastReceiver" name="platform/packages/apps/CellBroadcastReceiver" />
   <project path="packages/apps/CertInstaller" name="platform/packages/apps/CertInstaller" />
   <project path="packages/apps/Contacts" name="platform/packages/apps/Contacts" />
diff --git a/staging-panda.xml b/staging-panda.xml
index 4fd3c0e..813a08a 100644
--- a/staging-panda.xml
+++ b/staging-panda.xml
@@ -92,6 +92,7 @@
   <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.0.4" />
   <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.0.4" />
   <project path="external/strace" name="platform/external/strace" revision="linaro_android_4.0.4" />
+  <project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="linaro_android_4.0.4" />
 
   <!-- TI proprietary-open -->
   <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
@@ -229,7 +230,6 @@
   <project path="packages/apps/Browser" name="platform/packages/apps/Browser" />
   <project path="packages/apps/Calculator" name="platform/packages/apps/Calculator" />
   <project path="packages/apps/Calendar" name="platform/packages/apps/Calendar" />
-  <project path="packages/apps/Camera" name="platform/packages/apps/Camera" />
   <project path="packages/apps/CellBroadcastReceiver" name="platform/packages/apps/CellBroadcastReceiver" />
   <project path="packages/apps/CertInstaller" name="platform/packages/apps/CertInstaller" />
   <project path="packages/apps/Contacts" name="platform/packages/apps/Contacts" />
diff --git a/staging-vexpress-rtsm-isw.xml b/staging-vexpress-rtsm-isw.xml
index 5641a29..30df2d6 100644
--- a/staging-vexpress-rtsm-isw.xml
+++ b/staging-vexpress-rtsm-isw.xml
@@ -99,6 +99,7 @@
   <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.0.4" />
   <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.0.4" />
   <project path="external/strace" name="platform/external/strace" revision="linaro_android_4.0.4" />
+  <project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="linaro_android_4.0.4" />
 
   <!-- TI proprietary-open -->
   <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
@@ -236,7 +237,6 @@
   <project path="packages/apps/Browser" name="platform/packages/apps/Browser" />
   <project path="packages/apps/Calculator" name="platform/packages/apps/Calculator" />
   <project path="packages/apps/Calendar" name="platform/packages/apps/Calendar" />
-  <project path="packages/apps/Camera" name="platform/packages/apps/Camera" />
   <project path="packages/apps/CellBroadcastReceiver" name="platform/packages/apps/CellBroadcastReceiver" />
   <project path="packages/apps/CertInstaller" name="platform/packages/apps/CertInstaller" />
   <project path="packages/apps/Contacts" name="platform/packages/apps/Contacts" />
diff --git a/staging-vexpress-rtsm.xml b/staging-vexpress-rtsm.xml
index 89059ec..1bf7a4b 100644
--- a/staging-vexpress-rtsm.xml
+++ b/staging-vexpress-rtsm.xml
@@ -98,6 +98,7 @@
   <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.0.4" />
   <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.0.4" />
   <project path="external/strace" name="platform/external/strace" revision="linaro_android_4.0.4" />
+  <project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="linaro_android_4.0.4" />
 
   <!-- TI proprietary-open -->
   <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
@@ -235,7 +236,6 @@
   <project path="packages/apps/Browser" name="platform/packages/apps/Browser" />
   <project path="packages/apps/Calculator" name="platform/packages/apps/Calculator" />
   <project path="packages/apps/Calendar" name="platform/packages/apps/Calendar" />
-  <project path="packages/apps/Camera" name="platform/packages/apps/Camera" />
   <project path="packages/apps/CellBroadcastReceiver" name="platform/packages/apps/CellBroadcastReceiver" />
   <project path="packages/apps/CertInstaller" name="platform/packages/apps/CertInstaller" />
   <project path="packages/apps/Contacts" name="platform/packages/apps/Contacts" />
diff --git a/staging-vexpress.xml b/staging-vexpress.xml
index 5b66b4c..0afa369 100644
--- a/staging-vexpress.xml
+++ b/staging-vexpress.xml
@@ -94,6 +94,7 @@
   <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.0.4" />
   <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.0.4" />
   <project path="external/strace" name="platform/external/strace" revision="linaro_android_4.0.4" />
+  <project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="linaro_android_4.0.4" />
 
   <!-- TI proprietary-open -->
   <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
@@ -231,7 +232,6 @@
   <project path="packages/apps/Browser" name="platform/packages/apps/Browser" />
   <project path="packages/apps/Calculator" name="platform/packages/apps/Calculator" />
   <project path="packages/apps/Calendar" name="platform/packages/apps/Calendar" />
-  <project path="packages/apps/Camera" name="platform/packages/apps/Camera" />
   <project path="packages/apps/CellBroadcastReceiver" name="platform/packages/apps/CellBroadcastReceiver" />
   <project path="packages/apps/CertInstaller" name="platform/packages/apps/CertInstaller" />
   <project path="packages/apps/Contacts" name="platform/packages/apps/Contacts" />
diff --git a/tracking-origen.xml b/tracking-origen.xml
index 8397574..b9b8e8b 100644
--- a/tracking-origen.xml
+++ b/tracking-origen.xml
@@ -97,6 +97,7 @@
   <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.0.4" />
   <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.0.4" />
   <project path="external/strace" name="platform/external/strace" revision="linaro_android_4.0.4" />
+  <project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="linaro_android_4.0.4" />
 
   <!-- TI proprietary-open -->
   <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
@@ -234,7 +235,6 @@
   <project path="packages/apps/Browser" name="platform/packages/apps/Browser" />
   <project path="packages/apps/Calculator" name="platform/packages/apps/Calculator" />
   <project path="packages/apps/Calendar" name="platform/packages/apps/Calendar" />
-  <project path="packages/apps/Camera" name="platform/packages/apps/Camera" />
   <project path="packages/apps/CellBroadcastReceiver" name="platform/packages/apps/CellBroadcastReceiver" />
   <project path="packages/apps/CertInstaller" name="platform/packages/apps/CertInstaller" />
   <project path="packages/apps/Contacts" name="platform/packages/apps/Contacts" />
diff --git a/tracking-panda.xml b/tracking-panda.xml
index e8bfede..79b55db 100644
--- a/tracking-panda.xml
+++ b/tracking-panda.xml
@@ -92,6 +92,7 @@
   <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.0.4" />
   <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.0.4" />
   <project path="external/strace" name="platform/external/strace" revision="linaro_android_4.0.4" />
+  <project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="linaro_android_4.0.4" />
 
   <!-- TI proprietary-open -->
   <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
@@ -229,7 +230,6 @@
   <project path="packages/apps/Browser" name="platform/packages/apps/Browser" />
   <project path="packages/apps/Calculator" name="platform/packages/apps/Calculator" />
   <project path="packages/apps/Calendar" name="platform/packages/apps/Calendar" />
-  <project path="packages/apps/Camera" name="platform/packages/apps/Camera" />
   <project path="packages/apps/CellBroadcastReceiver" name="platform/packages/apps/CellBroadcastReceiver" />
   <project path="packages/apps/CertInstaller" name="platform/packages/apps/CertInstaller" />
   <project path="packages/apps/Contacts" name="platform/packages/apps/Contacts" />
diff --git a/tracking-snowball.xml b/tracking-snowball.xml
index b21eb18..b048cb4 100644
--- a/tracking-snowball.xml
+++ b/tracking-snowball.xml
@@ -97,6 +97,7 @@
   <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.0.4" />
   <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.0.4" />
   <project path="external/strace" name="platform/external/strace" revision="linaro_android_4.0.4" />
+  <project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="linaro_android_4.0.4" />
 
   <!-- TI proprietary-open -->
   <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
@@ -234,7 +235,6 @@
   <project path="packages/apps/Browser" name="platform/packages/apps/Browser" />
   <project path="packages/apps/Calculator" name="platform/packages/apps/Calculator" />
   <project path="packages/apps/Calendar" name="platform/packages/apps/Calendar" />
-  <project path="packages/apps/Camera" name="platform/packages/apps/Camera" />
   <project path="packages/apps/CellBroadcastReceiver" name="platform/packages/apps/CellBroadcastReceiver" />
   <project path="packages/apps/CertInstaller" name="platform/packages/apps/CertInstaller" />
   <project path="packages/apps/Contacts" name="platform/packages/apps/Contacts" />
diff --git a/tracking-vexpress.xml b/tracking-vexpress.xml
index 993ff9f..f253d4d 100644
--- a/tracking-vexpress.xml
+++ b/tracking-vexpress.xml
@@ -94,6 +94,7 @@
   <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.0.4" />
   <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.0.4" />
   <project path="external/strace" name="platform/external/strace" revision="linaro_android_4.0.4" />
+  <project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="linaro_android_4.0.4" />
 
   <!-- TI proprietary-open -->
   <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
@@ -231,7 +232,6 @@
   <project path="packages/apps/Browser" name="platform/packages/apps/Browser" />
   <project path="packages/apps/Calculator" name="platform/packages/apps/Calculator" />
   <project path="packages/apps/Calendar" name="platform/packages/apps/Calendar" />
-  <project path="packages/apps/Camera" name="platform/packages/apps/Camera" />
   <project path="packages/apps/CellBroadcastReceiver" name="platform/packages/apps/CellBroadcastReceiver" />
   <project path="packages/apps/CertInstaller" name="platform/packages/apps/CertInstaller" />
   <project path="packages/apps/Contacts" name="platform/packages/apps/Contacts" />
-- 
cgit v1.2.3