From 4d5bbe75f86836235e761997323a6ea4c4317d4e Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 3 Nov 2015 12:15:19 -0800 Subject: [PATCH] Bumping gaia.json for 4 gaia revision(s) a=gaia-bump MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ======== https://hg.mozilla.org/integration/gaia-central/rev/f793021410f8 Author: Hubert Figuière Desc: Merge pull request #32442 from hfiguiere/bug1214652-innerhtml Bug 1214652 - Part 1: fix the innerHTML unsafeness in the music specific files. r=justindarc ======== https://hg.mozilla.org/integration/gaia-central/rev/a4c16de300ac Author: Hubert Figuière Desc: Bug 1214652 - Fix the innerHTML unsafeness in the music specific files. ======== https://hg.mozilla.org/integration/gaia-central/rev/13d30bc778ce Author: punamdahiya Desc: Merge pull request #32976 from punamdahiya/Bug-1178290 Bug 1178290 - [Gallery] Use MediaFrame.maxImageDecodeSize to calculate output size in pick flow r=djf ======== https://hg.mozilla.org/integration/gaia-central/rev/053629d4d8d9 Author: Punam Dahiya Desc: Bug 1178290 - [Gallery] Use MediaFrame.maxImageDecodeSize to calculate output size in pick flow r=djf --- 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 87f2eb9c6d0..13a3c33d2a8 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "64248276ddd182888d68a3cb68c22460bfbc91e3", + "git_revision": "b4201a0ced4559443fcebaf14af5fb76385bbefe", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "36b76f262edb68e87aad287bf50b582df2c475fa", + "revision": "f793021410f891f8177bc22de5e803f859383bac", "repo_path": "integration/gaia-central" }