summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--default.xml2
-rw-r--r--landing-panda.xml2
-rw-r--r--landing-snowball.xml2
-rw-r--r--staging-iMX53.xml2
-rw-r--r--staging-iMX6.xml2
-rw-r--r--staging-origen.xml2
-rw-r--r--staging-panda.xml2
-rw-r--r--staging-vexpress-rtsm.xml2
-rw-r--r--staging-vexpress.xml2
-rw-r--r--tracking-origen.xml2
-rw-r--r--tracking-panda.xml2
-rw-r--r--tracking-snowball.xml2
12 files changed, 12 insertions, 12 deletions
diff --git a/default.xml b/default.xml
index 33c8ab2..650cb65 100644
--- a/default.xml
+++ b/default.xml
@@ -75,7 +75,7 @@
<project path="external/tremolo" name="platform/external/tremolo" revision="linaro_android_4.0.4" />
<project path="external/skia" name="platform/external/skia" revision="linaro_android_4.0.4" />
<project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.0.4" />
- <project name="people/afrantzis/glmark2" path="packages/apps/glmark2" remote="linaro-other" revision="members-meeting-demo"/>
+ <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" />
diff --git a/landing-panda.xml b/landing-panda.xml
index 88ba9ef..96d6f67 100644
--- a/landing-panda.xml
+++ b/landing-panda.xml
@@ -79,7 +79,7 @@
<project path="external/tremolo" name="platform/external/tremolo" revision="linaro_android_4.0.4" />
<project path="external/skia" name="platform/external/skia" revision="linaro_android_4.0.4" />
<project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.0.4" />
- <project name="people/afrantzis/glmark2" path="packages/apps/glmark2" remote="linaro-other" revision="members-meeting-demo"/>
+ <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="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" />
diff --git a/landing-snowball.xml b/landing-snowball.xml
index 64e7a23..1c0efb2 100644
--- a/landing-snowball.xml
+++ b/landing-snowball.xml
@@ -81,7 +81,7 @@
<project path="external/tremolo" name="platform/external/tremolo" revision="linaro_android_4.0.4" />
<project path="external/skia" name="platform/external/skia" revision="linaro_android_4.0.4" />
<project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.0.4" />
- <project name="people/afrantzis/glmark2" path="packages/apps/glmark2" remote="linaro-other" revision="members-meeting-demo"/>
+ <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="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"/>
diff --git a/staging-iMX53.xml b/staging-iMX53.xml
index 3cf816d..efd2faf 100644
--- a/staging-iMX53.xml
+++ b/staging-iMX53.xml
@@ -77,7 +77,7 @@
<project path="external/tremolo" name="platform/external/tremolo" revision="linaro_android_4.0.4" />
<project path="external/skia" name="platform/external/skia" revision="linaro_android_4.0.4" />
<project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.0.4" />
- <project name="people/afrantzis/glmark2" path="packages/apps/glmark2" remote="linaro-other" revision="members-meeting-demo"/>
+ <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="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"/>
diff --git a/staging-iMX6.xml b/staging-iMX6.xml
index d628786..f54641c 100644
--- a/staging-iMX6.xml
+++ b/staging-iMX6.xml
@@ -79,7 +79,7 @@
<project path="external/tremolo" name="platform/external/tremolo" revision="linaro_android_4.0.4" />
<project path="external/skia" name="platform/external/skia" revision="linaro_android_4.0.4" />
<project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.0.4" />
- <project name="people/afrantzis/glmark2" path="packages/apps/glmark2" remote="linaro-other" revision="members-meeting-demo"/>
+ <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="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"/>
diff --git a/staging-origen.xml b/staging-origen.xml
index a7191b5..9d12888 100644
--- a/staging-origen.xml
+++ b/staging-origen.xml
@@ -82,7 +82,7 @@
<project path="external/skia" name="platform/external/skia" revision="linaro_android_4.0.4" />
<project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.0.4" />
<project path="system/bluetooth" name="platform/system/bluetooth" revision="linaro_android_4.0.4" />
- <project name="people/afrantzis/glmark2" path="packages/apps/glmark2" remote="linaro-other" revision="members-meeting-demo"/>
+ <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="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"/>
diff --git a/staging-panda.xml b/staging-panda.xml
index b03394e..90d1ded 100644
--- a/staging-panda.xml
+++ b/staging-panda.xml
@@ -76,7 +76,7 @@
<project path="external/tremolo" name="platform/external/tremolo" revision="linaro_android_4.0.4" />
<project path="external/skia" name="platform/external/skia" revision="linaro_android_4.0.4" />
<project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.0.4" />
- <project name="people/afrantzis/glmark2" path="packages/apps/glmark2" remote="linaro-other" revision="members-meeting-demo"/>
+ <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="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" />
diff --git a/staging-vexpress-rtsm.xml b/staging-vexpress-rtsm.xml
index 7415c9e..5f460b2 100644
--- a/staging-vexpress-rtsm.xml
+++ b/staging-vexpress-rtsm.xml
@@ -82,7 +82,7 @@
<project path="external/tremolo" name="platform/external/tremolo" revision="linaro_android_4.0.4" />
<project path="external/skia" name="platform/external/skia" revision="linaro_android_4.0.4" />
<project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.0.4" />
- <project name="people/afrantzis/glmark2" path="packages/apps/glmark2" remote="linaro-other" revision="members-meeting-demo"/>
+ <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="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"/>
diff --git a/staging-vexpress.xml b/staging-vexpress.xml
index 98079b6..e092cd7 100644
--- a/staging-vexpress.xml
+++ b/staging-vexpress.xml
@@ -79,7 +79,7 @@
<project path="external/tremolo" name="platform/external/tremolo" revision="linaro_android_4.0.4" />
<project path="external/skia" name="platform/external/skia" revision="linaro_android_4.0.4" />
<project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.0.4" />
- <project name="people/afrantzis/glmark2" path="packages/apps/glmark2" remote="linaro-other" revision="members-meeting-demo"/>
+ <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="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"/>
diff --git a/tracking-origen.xml b/tracking-origen.xml
index 37a3bbc..cc48645 100644
--- a/tracking-origen.xml
+++ b/tracking-origen.xml
@@ -82,7 +82,7 @@
<project path="external/skia" name="platform/external/skia" revision="linaro_android_4.0.4" />
<project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.0.4" />
<project path="system/bluetooth" name="platform/system/bluetooth" revision="linaro_android_4.0.4" />
- <project name="people/afrantzis/glmark2" path="packages/apps/glmark2" remote="linaro-other" revision="members-meeting-demo"/>
+ <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="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"/>
diff --git a/tracking-panda.xml b/tracking-panda.xml
index b5a49be..2cade1f 100644
--- a/tracking-panda.xml
+++ b/tracking-panda.xml
@@ -76,7 +76,7 @@
<project path="external/tremolo" name="platform/external/tremolo" revision="linaro_android_4.0.4" />
<project path="external/skia" name="platform/external/skia" revision="linaro_android_4.0.4" />
<project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.0.4" />
- <project name="people/afrantzis/glmark2" path="packages/apps/glmark2" remote="linaro-other" revision="members-meeting-demo"/>
+ <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="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"/>
diff --git a/tracking-snowball.xml b/tracking-snowball.xml
index a6f9d78..57daabe 100644
--- a/tracking-snowball.xml
+++ b/tracking-snowball.xml
@@ -81,7 +81,7 @@
<project path="external/tremolo" name="platform/external/tremolo" revision="linaro_android_4.0.4" />
<project path="external/skia" name="platform/external/skia" revision="linaro_android_4.0.4" />
<project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.0.4" />
- <project name="people/afrantzis/glmark2" path="packages/apps/glmark2" remote="linaro-other" revision="members-meeting-demo"/>
+ <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="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"/>