Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
authorB2G Bumper Bot <release+b2gbumper@mozilla.com>
Fri, 21 Feb 2014 18:35:22 -0800
changeset 170427 87ec5f771b31b91be6995466b2501eedb94726f3
parent 170426 69fca7c67d313678c7b2bb66378ace260a0e4412
child 170428 ab4ec3f07096663be712af1af868497fed448b18
push id270
push userpvanderbeken@mozilla.com
push dateThu, 06 Mar 2014 09:24:21 +0000
reviewersgaia-bump
bugs16539, 971006, 16321
milestone30.0a1
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/1ab6b1fdffb8 Author: Kyle Machulis <kyle@nonpolynomial.com> Desc: Merge pull request #16539 from qdot/revert-971006 Revert "Merge pull request #16321 from vingtetun/bug971006-final" ======== https://hg.mozilla.org/integration/gaia-central/rev/7b8d72ef5e1a Author: Gareth Aye <gaye@mozilla.com> Desc: Revert "Merge pull request #16321 from vingtetun/bug971006-final" This reverts commit 19304fe63b26630f95c6f3a7da49349b433d476e, reversing changes made to b9859b9c2199e1c5b7e4eda220e556a7ff43cd21. Conflicts: apps/system/js/utility_tray.js apps/system/test/unit/utility_tray_test.js
b2g/config/gaia.json
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -1,4 +1,4 @@
 {
-    "revision": "fcd43750323fa9d6a4179f192abd31eecd2ca2ba", 
+    "revision": "1ab6b1fdffb85f34ff07ed2088ad74a9c06b098f", 
     "repo_path": "/integration/gaia-central"
 }