author B2G Bumper Bot <>
Mon, 11 May 2015 03:46:16 -0700
changeset 238344 3fc9edec8ffc1ec68084a1db33343c875d1b76c7
parent 237123 09dafeb43234b11afdb033c6cbbb086cccc353f7
child 238530 1ad8a7e8dcfbcca6bc2165122082e11ae66ef939
permissions -rw-r--r--
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== Author: albertopq <> Desc: Merge pull request #29998 from albertopq/1150025-uplift-v2.2 Bug 1150025 - Dismissing SIM dialog when opening the rocketbar ======== Author: albertopq <> Desc: Bug 1150025 - Dismissing SIM dialog when opening the rocketbar

# To trigger a clobber replace ALL of the textual description below,
# giving a bug number and a one line description of why a clobber is
# required. Modifying this file will make configure check that a
# clobber has been performed before the build can continue.
# MERGE NOTE: When merging two branches that require a CLOBBER, you should
#             merge both CLOBBER descriptions, to ensure that users on
#             both branches correctly see the clobber warning.
#                  O   <-- Users coming from both parents need to Clobber
#               /     \
#          O               O
#          |               |
#          O <-- Clobber   O  <-- Clobber
# Note: The description below will be part of the error message shown to users.
# Modifying this file will now automatically clobber the buildbot machines \o/

# Are you updating CLOBBER because you think it's needed for your WebIDL
# changes to stick? As of bug 928195, this shouldn't be necessary! Please
# don't change CLOBBER for WebIDL changes any more.

Merge day clobber