From 83dd570ebdbb4c44567f42302afb795dfca56d6e Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 13 May 2014 00:46:03 -0700 Subject: [PATCH] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/84b895ff4787 Author: GaryChen,PYChen Desc: Merge pull request #18974 from mpizza/bug_979785_overwrite_settings_by_device_type Bug 979785 - [GAIA][BUILD SYSTEM] Overwrite common-setting.json by GAIA_DEVICE_TYPE in build/settings.js. r=yurenju. ======== https://hg.mozilla.org/integration/gaia-central/rev/2477ea0caadb Author: mpizza Desc: Bug 979785 - [GAIA][BUILD SYSTEM] Overwrite common-setting.json by GAIA_DEVICE_TYPE in build/settings.js --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 4d5e854331c6..5f802e59367d 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "d37aa6da234abefd5227511661ec6a365c1cfb84", + "revision": "84b895ff478727d2924096da06ddcb2994488309", "repo_path": "/integration/gaia-central" }