manifest: (All) switch back to glmark2 master

Signed-off-by: Zach Pfeffer <zach.pfeffer@linaro.org>

12 files changed, 12 insertions, 12 deletions

diff --git a/default.xml b/default.xml
index 33c8ab2d7..650cb655b 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 88ba9ef2e..96d6f679b 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 64e7a23c3..1c0efb2a5 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 3cf816dbf..efd2fafad 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 d62878696..f54641cc5 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 a7191b53b..9d1288871 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 b03394e73..90d1dedcb 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 7415c9e3e..5f460b262 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 98079b6b2..e092cd723 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 37a3bbca8..cc48645cb 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 b5a49beb7..2cade1f5e 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 a6f9d78a2..57daabe24 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"/>