summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>2012-11-20 15:20:41 +0000
committerGerrit Code Review <gerrit@betelgeuse.canonical.com>2012-11-20 15:20:41 +0000
commit77fceb1c78ef474b84e972bea2530c8a740451ba (patch)
treef6e03300504fd3bf6160bd9c2991e8f444c5da87
parentf97e65043e6a553cfe48dddaf19584245485edf8 (diff)
parentc0110bcdfa3118b18dbb04089589f7d2a973e616 (diff)
Merge "manifests:(All) Fix the location of aib" into linaro_android_4.2
-rw-r--r--default.xml2
-rw-r--r--landing-snowball.xml2
-rw-r--r--linaro-default.xml2
-rw-r--r--staging-origen.xml2
-rw-r--r--staging-panda.xml2
-rw-r--r--staging-vexpress-rtsm-isw.xml2
-rw-r--r--staging-vexpress-rtsm.xml2
-rw-r--r--staging-vexpress-tc2-isw.xml2
-rw-r--r--staging-vexpress.xml2
-rw-r--r--tracking-origen-quad.xml2
-rw-r--r--tracking-origen.xml2
-rw-r--r--tracking-panda.xml2
-rw-r--r--tracking-snowball.xml2
-rw-r--r--tracking-vexpress-lw.xml2
-rw-r--r--tracking-vexpress-rtsm-mp.xml2
-rw-r--r--tracking-vexpress-tests.xml2
-rw-r--r--tracking-vexpress.xml2
17 files changed, 17 insertions, 17 deletions
diff --git a/default.xml b/default.xml
index cc114c4..e4d74ac 100644
--- a/default.xml
+++ b/default.xml
@@ -16,7 +16,7 @@
<!-- External extras -->
<project path="packages/apps/0xbench" name="platform/packages/apps/0xbench" revision="linaro-master" />
- <project path="external/android_input_bridge" name="platform/external/android_input_bridge" revision="linaro-master" />
+ <project path="external/android_input_bridge" name="platform/external/android-input-bridge" revision="linaro-master" />
<project path="external/lava-blackbox" name="lava-blackbox" remote="zyga" revision="master" />
<!-- Linaro extras -->
diff --git a/landing-snowball.xml b/landing-snowball.xml
index 4f84023..5d45ca8 100644
--- a/landing-snowball.xml
+++ b/landing-snowball.xml
@@ -19,7 +19,7 @@
<!-- External extras -->
<project path="packages/apps/0xbench" name="platform/packages/apps/0xbench" revision="linaro-master" />
- <project path="external/android_input_bridge" name="platform/external/android_input_bridge" revision="linaro-master" />
+ <project path="external/android_input_bridge" name="platform/external/android-input-bridge" revision="linaro-master" />
<project path="external/lava-blackbox" name="lava-blackbox" remote="zyga" revision="master" />
<!-- Linaro extras -->
diff --git a/linaro-default.xml b/linaro-default.xml
index e4de410..e0008fa 100644
--- a/linaro-default.xml
+++ b/linaro-default.xml
@@ -16,7 +16,7 @@
<!-- External extras -->
<project path="packages/apps/0xbench" name="platform/packages/apps/0xbench" revision="linaro-master" />
- <project path="external/android_input_bridge" name="platform/external/android_input_bridge" revision="linaro-master" />
+ <project path="external/android_input_bridge" name="platform/external/android-input-bridge" revision="linaro-master" />
<project path="external/lava-blackbox" name="lava-blackbox" remote="zyga" revision="master" />
<!-- Linaro extras -->
diff --git a/staging-origen.xml b/staging-origen.xml
index ccddbe0..00e7f3d 100644
--- a/staging-origen.xml
+++ b/staging-origen.xml
@@ -16,7 +16,7 @@
<!-- External extras -->
<project path="packages/apps/0xbench" name="platform/packages/apps/0xbench" revision="linaro-master" />
- <project path="external/android_input_bridge" name="platform/external/android_input_bridge" revision="linaro-master" />
+ <project path="external/android_input_bridge" name="platform/external/android-input-bridge" revision="linaro-master" />
<project path="external/lava-blackbox" name="lava-blackbox" remote="zyga" revision="master" />
<!-- Linaro extras -->
diff --git a/staging-panda.xml b/staging-panda.xml
index a3877f1..2d0ff76 100644
--- a/staging-panda.xml
+++ b/staging-panda.xml
@@ -16,7 +16,7 @@
<!-- External extras -->
<project path="packages/apps/0xbench" name="platform/packages/apps/0xbench" revision="linaro-master" />
- <project path="external/android_input_bridge" name="platform/external/android_input_bridge" revision="linaro-master" />
+ <project path="external/android_input_bridge" name="platform/external/android-input-bridge" revision="linaro-master" />
<project path="external/lava-blackbox" name="lava-blackbox" remote="zyga" revision="master" />
<!-- Linaro extras -->
diff --git a/staging-vexpress-rtsm-isw.xml b/staging-vexpress-rtsm-isw.xml
index e092295..02a4c0c 100644
--- a/staging-vexpress-rtsm-isw.xml
+++ b/staging-vexpress-rtsm-isw.xml
@@ -18,7 +18,7 @@
<!-- External extras -->
<project path="packages/apps/0xbench" name="platform/packages/apps/0xbench" revision="linaro-master" />
- <project path="external/android_input_bridge" name="platform/external/android_input_bridge" revision="linaro-master" />
+ <project path="external/android_input_bridge" name="platform/external/android-input-bridge" revision="linaro-master" />
<project path="external/lava-blackbox" name="lava-blackbox" remote="zyga" revision="master" />
<!-- Linaro extras -->
diff --git a/staging-vexpress-rtsm.xml b/staging-vexpress-rtsm.xml
index aac7d85..b201548 100644
--- a/staging-vexpress-rtsm.xml
+++ b/staging-vexpress-rtsm.xml
@@ -16,7 +16,7 @@
<!-- External extras -->
<project path="packages/apps/0xbench" name="platform/packages/apps/0xbench" revision="linaro-master" />
- <project path="external/android_input_bridge" name="platform/external/android_input_bridge" revision="linaro-master" />
+ <project path="external/android_input_bridge" name="platform/external/android-input-bridge" revision="linaro-master" />
<project path="external/lava-blackbox" name="lava-blackbox" remote="zyga" revision="master" />
<!-- Linaro extras -->
diff --git a/staging-vexpress-tc2-isw.xml b/staging-vexpress-tc2-isw.xml
index 1fd112b..b8e4824 100644
--- a/staging-vexpress-tc2-isw.xml
+++ b/staging-vexpress-tc2-isw.xml
@@ -18,7 +18,7 @@
<!-- External extras -->
<project path="packages/apps/0xbench" name="platform/packages/apps/0xbench" revision="linaro-master" />
- <project path="external/android_input_bridge" name="platform/external/android_input_bridge" revision="linaro-master" />
+ <project path="external/android_input_bridge" name="platform/external/android-input-bridge" revision="linaro-master" />
<project path="external/lava-blackbox" name="lava-blackbox" remote="zyga" revision="master" />
<!-- Linaro extras -->
diff --git a/staging-vexpress.xml b/staging-vexpress.xml
index a289eb6..3cdb141 100644
--- a/staging-vexpress.xml
+++ b/staging-vexpress.xml
@@ -16,7 +16,7 @@
<!-- External extras -->
<project path="packages/apps/0xbench" name="platform/packages/apps/0xbench" revision="linaro-master" />
- <project path="external/android_input_bridge" name="platform/external/android_input_bridge" revision="linaro-master" />
+ <project path="external/android_input_bridge" name="platform/external/android-input-bridge" revision="linaro-master" />
<project path="external/lava-blackbox" name="lava-blackbox" remote="zyga" revision="master" />
<!-- Linaro extras -->
diff --git a/tracking-origen-quad.xml b/tracking-origen-quad.xml
index 7b6b2d9..b2708d7 100644
--- a/tracking-origen-quad.xml
+++ b/tracking-origen-quad.xml
@@ -16,7 +16,7 @@
<!-- External extras -->
<project path="packages/apps/0xbench" name="platform/packages/apps/0xbench" revision="linaro-master" />
- <project path="external/android_input_bridge" name="platform/external/android_input_bridge" revision="linaro-master" />
+ <project path="external/android_input_bridge" name="platform/external/android-input-bridge" revision="linaro-master" />
<project path="external/lava-blackbox" name="lava-blackbox" remote="zyga" revision="master" />
<!-- Linaro extras -->
diff --git a/tracking-origen.xml b/tracking-origen.xml
index 7dbb0e9..4e8a708 100644
--- a/tracking-origen.xml
+++ b/tracking-origen.xml
@@ -16,7 +16,7 @@
<!-- External extras -->
<project path="packages/apps/0xbench" name="platform/packages/apps/0xbench" revision="linaro-master" />
- <project path="external/android_input_bridge" name="platform/external/android_input_bridge" revision="linaro-master" />
+ <project path="external/android_input_bridge" name="platform/external/android-input-bridge" revision="linaro-master" />
<project path="external/lava-blackbox" name="lava-blackbox" remote="zyga" revision="master" />
<!-- Linaro extras -->
diff --git a/tracking-panda.xml b/tracking-panda.xml
index de86817..3b92e7e 100644
--- a/tracking-panda.xml
+++ b/tracking-panda.xml
@@ -16,7 +16,7 @@
<!-- External extras -->
<project path="packages/apps/0xbench" name="platform/packages/apps/0xbench" revision="linaro-master" />
- <project path="external/android_input_bridge" name="platform/external/android_input_bridge" revision="linaro-master" />
+ <project path="external/android_input_bridge" name="platform/external/android-input-bridge" revision="linaro-master" />
<project path="external/lava-blackbox" name="lava-blackbox" remote="zyga" revision="master" />
<!-- Linaro extras -->
diff --git a/tracking-snowball.xml b/tracking-snowball.xml
index 612cdc6..47dd61d 100644
--- a/tracking-snowball.xml
+++ b/tracking-snowball.xml
@@ -19,7 +19,7 @@
<!-- External extras -->
<project path="packages/apps/0xbench" name="platform/packages/apps/0xbench" revision="linaro-master" />
- <project path="external/android_input_bridge" name="platform/external/android_input_bridge" revision="linaro-master" />
+ <project path="external/android_input_bridge" name="platform/external/android-input-bridge" revision="linaro-master" />
<project path="external/lava-blackbox" name="lava-blackbox" remote="zyga" revision="master" />
<!-- Linaro extras -->
diff --git a/tracking-vexpress-lw.xml b/tracking-vexpress-lw.xml
index 4034c5d..0d3951a 100644
--- a/tracking-vexpress-lw.xml
+++ b/tracking-vexpress-lw.xml
@@ -16,7 +16,7 @@
<!-- External extras -->
<project path="packages/apps/0xbench" name="platform/packages/apps/0xbench" revision="linaro-master" />
- <project path="external/android_input_bridge" name="platform/external/android_input_bridge" revision="linaro-master" />
+ <project path="external/android_input_bridge" name="platform/external/android-input-bridge" revision="linaro-master" />
<project path="external/lava-blackbox" name="lava-blackbox" remote="zyga" revision="master" />
<!-- Linaro extras -->
diff --git a/tracking-vexpress-rtsm-mp.xml b/tracking-vexpress-rtsm-mp.xml
index d29dde8..1b491dd 100644
--- a/tracking-vexpress-rtsm-mp.xml
+++ b/tracking-vexpress-rtsm-mp.xml
@@ -16,7 +16,7 @@
<!-- External extras -->
<project path="packages/apps/0xbench" name="platform/packages/apps/0xbench" revision="linaro-master" />
- <project path="external/android_input_bridge" name="platform/external/android_input_bridge" revision="linaro-master" />
+ <project path="external/android_input_bridge" name="platform/external/android-input-bridge" revision="linaro-master" />
<project path="external/lava-blackbox" name="lava-blackbox" remote="zyga" revision="master" />
<!-- Linaro extras -->
diff --git a/tracking-vexpress-tests.xml b/tracking-vexpress-tests.xml
index 59a81af..bbf995e 100644
--- a/tracking-vexpress-tests.xml
+++ b/tracking-vexpress-tests.xml
@@ -18,7 +18,7 @@
<!-- External extras -->
<project path="packages/apps/0xbench" name="platform/packages/apps/0xbench" revision="linaro-master" />
- <project path="external/android_input_bridge" name="platform/external/android_input_bridge" revision="linaro-master" />
+ <project path="external/android_input_bridge" name="platform/external/android-input-bridge" revision="linaro-master" />
<project path="external/lava-blackbox" name="lava-blackbox" remote="zyga" revision="master" />
<!-- Linaro extras -->
diff --git a/tracking-vexpress.xml b/tracking-vexpress.xml
index 8465e92..66074a8 100644
--- a/tracking-vexpress.xml
+++ b/tracking-vexpress.xml
@@ -16,7 +16,7 @@
<!-- External extras -->
<project path="packages/apps/0xbench" name="platform/packages/apps/0xbench" revision="linaro-master" />
- <project path="external/android_input_bridge" name="platform/external/android_input_bridge" revision="linaro-master" />
+ <project path="external/android_input_bridge" name="platform/external/android-input-bridge" revision="linaro-master" />
<project path="external/lava-blackbox" name="lava-blackbox" remote="zyga" revision="master" />
<!-- Linaro extras -->