From 67de9a48d159e1bf2d957fb9680b0ed910f8c9d0 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Thu, 29 Jan 2015 19:46:04 -0800 Subject: [PATCH] Bumping gaia.json for 3 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-2_1/rev/28dabef7d06c Author: Ryan VanderMeulen Desc: Merge pull request #27489 from EragonJ/v2.1-bug-1107696 Bug 1107696 - Fix the problem that cannot connect to hidden network, r=crh0716 ======== https://hg.mozilla.org/integration/gaia-2_1/rev/a9ac3df2e78b Author: EragonJ Desc: Bug 1107696 - Fix the problem that cannot connect to hidden network Because in wifi_join_hidden panel, we were overriding the wrong properties and this would make this panel broken after first-time use ======== https://hg.mozilla.org/integration/gaia-2_1/rev/a245a14de102 Author: Steve Chung Desc: Bug 1118154 - [FFOS7715 v2.1] [dolphin] FFOS can not receive Cell Broadcast messages on SIM2, r=kgrandon Conflicts: apps/system/js/cell_broadcast_system.js apps/system/test/unit/cell_broadcast_system_test.js --- b2g/config/gaia.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index ffb8c744aff7..90c7ef9a1991 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "0ef345ec8b5a2cbde4bf46304eb59ab1c32ee251", + "git_revision": "01bf4bd548be38a762c4e4582925159e6226dfa2", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "8bfda0865a128e284b4efa78bc2976f76350dfcc", + "revision": "28dabef7d06cc12eb5bbdc2e29133f79b6a5cdf0", "repo_path": "integration/gaia-2_1" } -- 2.11.4.GIT