Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
authorB2G Bumper Bot <release+b2gbumper@mozilla.com>
Fri, 14 Feb 2014 05:45:13 -0800
changeset 169326 bdfdcaeccbcfb938cade449aa978f22935c49f25
parent 169325 b47b10e405a5831013e362918519a1e7f3bb4dd3
child 169327 5ef58a7cd6a6eaa82ecfdcbef4c69e334bc79714
push id270
push userpvanderbeken@mozilla.com
push dateThu, 06 Mar 2014 09:24:21 +0000
reviewersgaia-bump
bugs16261, 960611, 958200, 15897
milestone30.0a1
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/a32bb62eaf27 Author: Ryan VanderMeulen <ryanvm@gmail.com> Desc: Revert "Merge pull request #16261 from dmarcos/bug960611+bug958200" This reverts commit 3d01dbcfe42d6f57c794855b8c4bcc462e4e38d1, reversing changes made to c83c1807de0182ee7e5cbdc9d5bdc7e4a5f6e08d. ======== https://hg.mozilla.org/integration/gaia-central/rev/3ebed66f3a0e Author: Ryan VanderMeulen <ryanvm@gmail.com> Desc: Revert "Merge pull request #15897 from snowmantw/issue960901-instantiable-lockscreen" This reverts commit efba9babeedbb0c9af9b7cb91a5630d7be2f5d8d, reversing changes made to 8ac5dc6b76709e742cb923c58d1f4b415b3e08fb. Conflicts: apps/system/js/storage.js
b2g/config/gaia.json
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -1,4 +1,4 @@
 {
-    "revision": "cc11cc55e7dfb41870950cdd5e3c5b341cb980e1", 
+    "revision": "a32bb62eaf275727666d1ed17d16ffd8877b9831", 
     "repo_path": "/integration/gaia-central"
 }