author B2G Bumper Bot <>
Mon, 22 Feb 2016 20:52:33 -0800
changeset 325574 f177f8ec083efc5ddb5d3c854ae7bb383b1b6a45
parent 320033 159e0a5a653f2789e0c9b94f41501a4a44f7cb34
child 323350 8849dd1a4a796c2fd70d6f002912c3f799c59e69
child 325029 0e4c29a5ea1568f9ddaee553ca2f45111ecb27ef
permissions -rw-r--r--
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== Author: Ricky Chien <> Desc: Merge pull request #34079 from rickychien/show-hint-after-load Bug 1250032 - [Marketplace] Hint should show after the app finish loading r=@luke-chang ======== Author: Ricky Chien <> Desc: Bug 1250032 - [Marketplace] Hint should show after the app finish loading

# 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.

Bug 1246756 - Update Skia to m49 branch.