From de477c3366893b2784258af1aaba0b3072283441 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 19 Oct 2015 01:05:33 -0700 Subject: [PATCH 01/19] Bumping gaia.json for 5 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/8be78fcf836b Author: Timothy Guan-tin Chien Desc: Merge pull request #32536 from timdream/input-mgmt-chrome-event2 Bug 1207485 - Remove mozChromeEvent/mozContentEvent w/ new InputMethod API methods, r=albertopq ======== https://hg.mozilla.org/integration/gaia-central/rev/2d8ecd5869db Author: Timothy Guan-tin Chien Desc: Bug 1207485 - Part II, Use addinputrequest/removeinputrequest events to handle addInput()/removeInput() ======== https://hg.mozilla.org/integration/gaia-central/rev/f372403a5fd3 Author: Timothy Guan-tin Chien Desc: Bug 1207485 - Remove mozChromeEvent/mozContentEvent w/ new InputMethod API methods ======== https://hg.mozilla.org/integration/gaia-central/rev/508a6cea1619 Author: Staś Małolepszy Desc: Merge pull request #32526 from stasm/1215454-l20n-3.3.3 Bug 1215454 - Update l20n.js to 3.3.3. r=gandalf ======== https://hg.mozilla.org/integration/gaia-central/rev/c02403f4901d Author: Staś Małolepszy Desc: Bug 1215454 - Update l20n.js to 3.3.3. r=gandalf --- 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 8e4bd969260b..3bac32370b92 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "f75bd584aca0a751a5bed115800250faa8412927", + "git_revision": "043b7c9231335e2257588005ab9c13dcdb7fc3c4", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "8c3fb9e6ae490d957278e80817c0735241b11146", + "revision": "8be78fcf836b7ef4037e9210e3d9979ac10fdcc3", "repo_path": "integration/gaia-central" } From 7a8d76ed2e9616e092e5aa3047d3998a86f68822 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 19 Oct 2015 01:08:23 -0700 Subject: [PATCH 02/19] Bumping manifests a=b2g-bump --- b2g/config/aries/sources.xml | 2 +- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator-l/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/nexus-4-kk/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/nexus-5-l/sources.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/aries/sources.xml b/b2g/config/aries/sources.xml index 6a658ebd5764..5824689d39cb 100644 --- a/b2g/config/aries/sources.xml +++ b/b2g/config/aries/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 3372dd29a84c..76c2c27fa3a1 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index f2b17d5c78d9..5964b3e39f90 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index d5cc3c4e5025..89bcc1d536b0 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 2c74cd4b1ab9..e5dd90b73fbb 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml index 44ee91d86511..4fc56dc6da13 100644 --- a/b2g/config/emulator-l/sources.xml +++ b/b2g/config/emulator-l/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index f2b17d5c78d9..5964b3e39f90 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index 69dd16881b45..8ec8de571394 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4-kk/sources.xml b/b2g/config/nexus-4-kk/sources.xml index c497f9503a07..3ecb501ccd6f 100644 --- a/b2g/config/nexus-4-kk/sources.xml +++ b/b2g/config/nexus-4-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index bfb1beaeed1b..77fed1d43ad2 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -18,7 +18,7 @@ - + diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml index 604599bc4e6c..74f5d0047e2d 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From 7e07e5f990428a025bacfbb2be04c4a053743511 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 19 Oct 2015 01:55:33 -0700 Subject: [PATCH 03/19] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/768b08a0cd32 Author: albertopq Desc: Merge pull request #32500 from albertopq/1215476-task-manager-test Bug 1215476 - Fixing task manager marionette tests r=mcav ======== https://hg.mozilla.org/integration/gaia-central/rev/e71060c8af8e Author: albertopq Desc: Bug 1215476 - Fixing task manager marionette tests --- 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 3bac32370b92..de3b0ee3b93b 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "043b7c9231335e2257588005ab9c13dcdb7fc3c4", + "git_revision": "b86bffe236928abe156397d3582ae00d4699ac2e", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "8be78fcf836b7ef4037e9210e3d9979ac10fdcc3", + "revision": "768b08a0cd32764669cecfd92cf18d36c7b7317c", "repo_path": "integration/gaia-central" } From 74252b46439527abf7cf8d727c72b2071fffbd53 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 19 Oct 2015 01:58:16 -0700 Subject: [PATCH 04/19] Bumping manifests a=b2g-bump --- b2g/config/aries/sources.xml | 2 +- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator-l/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/nexus-4-kk/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/nexus-5-l/sources.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/aries/sources.xml b/b2g/config/aries/sources.xml index 5824689d39cb..054b3f90156f 100644 --- a/b2g/config/aries/sources.xml +++ b/b2g/config/aries/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 76c2c27fa3a1..d7996ac4068c 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 5964b3e39f90..01257eb52907 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 89bcc1d536b0..6ddcb8eafa18 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index e5dd90b73fbb..1214991a7351 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml index 4fc56dc6da13..16b6c0a16a90 100644 --- a/b2g/config/emulator-l/sources.xml +++ b/b2g/config/emulator-l/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 5964b3e39f90..01257eb52907 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index 8ec8de571394..df4a7b34290d 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4-kk/sources.xml b/b2g/config/nexus-4-kk/sources.xml index 3ecb501ccd6f..c62fd8282ce1 100644 --- a/b2g/config/nexus-4-kk/sources.xml +++ b/b2g/config/nexus-4-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 77fed1d43ad2..feb1fe27672e 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -18,7 +18,7 @@ - + diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml index 74f5d0047e2d..aa6536e09712 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From 511e6f38191163551601c407c5522472b820a1ce Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 19 Oct 2015 04:00:35 -0700 Subject: [PATCH 05/19] Bumping gaia.json for 10 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/2636d3619ad8 Author: Fernando Jiménez Moreno Desc: No bug number - Update build instructions for Sync. r=me ======== https://hg.mozilla.org/integration/gaia-central/rev/3c3133b062f1 Author: albertopq Desc: Merge pull request #32540 from albertopq/1215879-tracking-l10n Bug 1215879 - Fixing margin on Tracking Protection title r=gmarty ======== https://hg.mozilla.org/integration/gaia-central/rev/554523c5cfb0 Author: albertopq Desc: Bug 1215879 - Fixing margin on Tracking Protection title ======== https://hg.mozilla.org/integration/gaia-central/rev/6f6b30f8058e Author: albertopq Desc: Merge pull request #32542 from albertopq/1216042-pin-icon Bug 1216042 - Show default icon in the Pin dialog r=gmarty ======== https://hg.mozilla.org/integration/gaia-central/rev/f4e07205ce21 Author: albertopq Desc: Bug 1216042 - Show default icon in the Pin dialog ======== https://hg.mozilla.org/integration/gaia-central/rev/7ee99abe30b9 Author: evelynhung Desc: Merge pull request #32538 from evelynhung/issue-1216050 Bug 1216050 - remove fack tv channel info, r=rexboy ======== https://hg.mozilla.org/integration/gaia-central/rev/a044c017011d Author: Evelyn Hung Desc: Bug 1216050 - remove fack tv channel info ======== https://hg.mozilla.org/integration/gaia-central/rev/0e7701d697a0 Author: Chris Lord Desc: Merge pull request #32541 from Cwiiis/bug1191745-bug1202422-reland Bug 1191745 - Switch to new home screen by default + Bug 1202422 - Migrate from verticalhome to homescreen ======== https://hg.mozilla.org/integration/gaia-central/rev/51dbf0037ef9 Author: Chris Lord Desc: Bug 1202422 - Migrate from verticalhome to homescreen. r=albertopq,etienne ======== https://hg.mozilla.org/integration/gaia-central/rev/ad4e85de223c Author: Chris Lord Desc: Bug 1191745 - Switch to new homescreen by default. r=gmarty --- 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 de3b0ee3b93b..6c13572784fc 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "b86bffe236928abe156397d3582ae00d4699ac2e", + "git_revision": "e8c417552569ca8b6d8f04f7a1723d77db2d0d85", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "768b08a0cd32764669cecfd92cf18d36c7b7317c", + "revision": "2636d3619ad898de00f37906fd869da2614df8c6", "repo_path": "integration/gaia-central" } From c1754d1ba9d3d94cd39cf5adea13c88854057152 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 19 Oct 2015 04:03:22 -0700 Subject: [PATCH 06/19] Bumping manifests a=b2g-bump --- b2g/config/aries/sources.xml | 2 +- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator-l/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/nexus-4-kk/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/nexus-5-l/sources.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/aries/sources.xml b/b2g/config/aries/sources.xml index 054b3f90156f..a67ab2b7b50c 100644 --- a/b2g/config/aries/sources.xml +++ b/b2g/config/aries/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index d7996ac4068c..d37f4608ddcb 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 01257eb52907..c5bc71afa06d 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 6ddcb8eafa18..309de31b8ed1 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 1214991a7351..78604c1ec441 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml index 16b6c0a16a90..6ae819a04d2e 100644 --- a/b2g/config/emulator-l/sources.xml +++ b/b2g/config/emulator-l/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 01257eb52907..c5bc71afa06d 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index df4a7b34290d..c0ae02b16a4a 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4-kk/sources.xml b/b2g/config/nexus-4-kk/sources.xml index c62fd8282ce1..a6eb9936d33b 100644 --- a/b2g/config/nexus-4-kk/sources.xml +++ b/b2g/config/nexus-4-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index feb1fe27672e..3cff79f9f0e8 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -18,7 +18,7 @@ - + diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml index aa6536e09712..cce4c1b284dc 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From d3392ce740a931b68d52331545c49935f8559c5e Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 19 Oct 2015 04:55:35 -0700 Subject: [PATCH 07/19] Bumping gaia.json for 1 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/8a4561380a8d Author: Michael Henretty Desc: Revert "Merge pull request #32500 from albertopq/1215476-task-manager-test" This reverts commit b86bffe236928abe156397d3582ae00d4699ac2e, reversing changes made to 043b7c9231335e2257588005ab9c13dcdb7fc3c4. --- 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 6c13572784fc..df27157af11d 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "e8c417552569ca8b6d8f04f7a1723d77db2d0d85", + "git_revision": "9cf6b6156cc74616ffcba8956d47982b4405345e", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "2636d3619ad898de00f37906fd869da2614df8c6", + "revision": "8a4561380a8dc63118a34bc21cc59248382e7c59", "repo_path": "integration/gaia-central" } From a7d64dcb3161a19839e179b355a098c5fed9a617 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 19 Oct 2015 04:58:20 -0700 Subject: [PATCH 08/19] Bumping manifests a=b2g-bump --- b2g/config/aries/sources.xml | 2 +- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator-l/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/nexus-4-kk/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/nexus-5-l/sources.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/aries/sources.xml b/b2g/config/aries/sources.xml index a67ab2b7b50c..3dc4dec9a2d4 100644 --- a/b2g/config/aries/sources.xml +++ b/b2g/config/aries/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index d37f4608ddcb..4ac968b18bd1 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index c5bc71afa06d..6bfed735bbfd 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 309de31b8ed1..2aaa6f5634bf 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 78604c1ec441..88147c202f3b 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml index 6ae819a04d2e..cba110f6f2bd 100644 --- a/b2g/config/emulator-l/sources.xml +++ b/b2g/config/emulator-l/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index c5bc71afa06d..6bfed735bbfd 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index c0ae02b16a4a..b1d8900a0c85 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4-kk/sources.xml b/b2g/config/nexus-4-kk/sources.xml index a6eb9936d33b..96a90ffc90d9 100644 --- a/b2g/config/nexus-4-kk/sources.xml +++ b/b2g/config/nexus-4-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 3cff79f9f0e8..39da36effbab 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -18,7 +18,7 @@ - + diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml index cce4c1b284dc..193401218dd1 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From f15add29ed74a783591e1b2d87fb8baca3419498 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 19 Oct 2015 05:47:05 -0700 Subject: [PATCH 09/19] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/a5749cf4131c Author: Ben Francis Desc: Merge pull request #32531 from benfrancis/1215926 Bug 1215926 - Fix strings in pin dialog r=albertopq ======== https://hg.mozilla.org/integration/gaia-central/rev/9027816c12a6 Author: Ben Francis Desc: Bug 1215926 - Fix strings in pin dialog --- 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 df27157af11d..2428a98d2bc0 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "9cf6b6156cc74616ffcba8956d47982b4405345e", + "git_revision": "8610f9b289f2b7edd1b22e58d39cc5e245606410", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "8a4561380a8dc63118a34bc21cc59248382e7c59", + "revision": "a5749cf4131c95259467b31a689e55e90ed72a7d", "repo_path": "integration/gaia-central" } From 944f63848f151dbbf702e8ac6311708fa0dec843 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 19 Oct 2015 05:49:48 -0700 Subject: [PATCH 10/19] Bumping manifests a=b2g-bump --- b2g/config/aries/sources.xml | 2 +- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator-l/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/nexus-4-kk/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/nexus-5-l/sources.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/aries/sources.xml b/b2g/config/aries/sources.xml index 3dc4dec9a2d4..e16f54df1370 100644 --- a/b2g/config/aries/sources.xml +++ b/b2g/config/aries/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 4ac968b18bd1..d1b85804d227 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 6bfed735bbfd..fb063af01a55 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 2aaa6f5634bf..63544d7ca0f5 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 88147c202f3b..df0ca57b8479 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml index cba110f6f2bd..66077b7da578 100644 --- a/b2g/config/emulator-l/sources.xml +++ b/b2g/config/emulator-l/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 6bfed735bbfd..fb063af01a55 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index b1d8900a0c85..2a0bf6824a7b 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4-kk/sources.xml b/b2g/config/nexus-4-kk/sources.xml index 96a90ffc90d9..c955676ae2ad 100644 --- a/b2g/config/nexus-4-kk/sources.xml +++ b/b2g/config/nexus-4-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 39da36effbab..fb2298b9f213 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -18,7 +18,7 @@ - + diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml index 193401218dd1..a4c28c50d062 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From 183ac70ad7f47958a3f0d314a3e906e12f6acac6 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 19 Oct 2015 06:15:25 -0700 Subject: [PATCH 11/19] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/469c2040a2b5 Author: Francisco Jordano Desc: Merge pull request #32543 from julienw/1213539-followup Bug 1213539 - Follow-up to fix a typo r=francisco ======== https://hg.mozilla.org/integration/gaia-central/rev/1370b70140f3 Author: Julien Wajsberg Desc: Bug 1213539 - Follow-up to fix a typo r=francisco --- 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 2428a98d2bc0..bb87d16dcc2e 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "8610f9b289f2b7edd1b22e58d39cc5e245606410", + "git_revision": "fca30ed2012307a21111aabafb9e181a4f7a6c46", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "a5749cf4131c95259467b31a689e55e90ed72a7d", + "revision": "469c2040a2b522adfa2a37be49e3751dfb7ea5c7", "repo_path": "integration/gaia-central" } From 5aae2fc4801e3bc6441a46de8cde7b04b6fe752c Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 19 Oct 2015 06:18:28 -0700 Subject: [PATCH 12/19] Bumping manifests a=b2g-bump --- b2g/config/aries/sources.xml | 2 +- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator-l/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/nexus-4-kk/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/nexus-5-l/sources.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/aries/sources.xml b/b2g/config/aries/sources.xml index e16f54df1370..73d0e6eefbdb 100644 --- a/b2g/config/aries/sources.xml +++ b/b2g/config/aries/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index d1b85804d227..1e96387aa15c 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index fb063af01a55..bea97fd1a5a9 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 63544d7ca0f5..d1c8391e7641 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index df0ca57b8479..7970f5997d29 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml index 66077b7da578..e772268f9b44 100644 --- a/b2g/config/emulator-l/sources.xml +++ b/b2g/config/emulator-l/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index fb063af01a55..bea97fd1a5a9 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index 2a0bf6824a7b..54bcf72bf3d5 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4-kk/sources.xml b/b2g/config/nexus-4-kk/sources.xml index c955676ae2ad..eefbc1fcdaa6 100644 --- a/b2g/config/nexus-4-kk/sources.xml +++ b/b2g/config/nexus-4-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index fb2298b9f213..cd76c6316d1b 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -18,7 +18,7 @@ - + diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml index a4c28c50d062..18186108a90d 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From 78084d012c1591148f7e99ee039a9b9b6da5d1b1 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 19 Oct 2015 07:09:04 -0700 Subject: [PATCH 13/19] Bumping manifests a=b2g-bump --- b2g/config/aries/sources.xml | 1 + b2g/config/dolphin/sources.xml | 1 + b2g/config/emulator-ics/sources.xml | 1 + b2g/config/emulator-jb/sources.xml | 1 + b2g/config/emulator-kk/sources.xml | 1 + b2g/config/emulator-l/sources.xml | 1 + b2g/config/emulator/sources.xml | 1 + b2g/config/flame-kk/sources.xml | 1 + b2g/config/nexus-4-kk/sources.xml | 1 + b2g/config/nexus-4/sources.xml | 1 + b2g/config/nexus-5-l/sources.xml | 1 + 11 files changed, 11 insertions(+) diff --git a/b2g/config/aries/sources.xml b/b2g/config/aries/sources.xml index 73d0e6eefbdb..51e64c038bc3 100644 --- a/b2g/config/aries/sources.xml +++ b/b2g/config/aries/sources.xml @@ -25,6 +25,7 @@ + diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 1e96387aa15c..0824396d8c7e 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -25,6 +25,7 @@ + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index bea97fd1a5a9..2c9e1e191819 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -26,6 +26,7 @@ + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index d1c8391e7641..33a62edd9436 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -23,6 +23,7 @@ + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 7970f5997d29..00148851b566 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -24,6 +24,7 @@ + diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml index e772268f9b44..8370aa081ec0 100644 --- a/b2g/config/emulator-l/sources.xml +++ b/b2g/config/emulator-l/sources.xml @@ -24,6 +24,7 @@ + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index bea97fd1a5a9..2c9e1e191819 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -26,6 +26,7 @@ + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index 54bcf72bf3d5..a383cd9ae005 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -25,6 +25,7 @@ + diff --git a/b2g/config/nexus-4-kk/sources.xml b/b2g/config/nexus-4-kk/sources.xml index eefbc1fcdaa6..60d6dad1e479 100644 --- a/b2g/config/nexus-4-kk/sources.xml +++ b/b2g/config/nexus-4-kk/sources.xml @@ -25,6 +25,7 @@ + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index cd76c6316d1b..a54123f6ae35 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -24,6 +24,7 @@ + diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml index 18186108a90d..6114a7cb4ed8 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -25,6 +25,7 @@ + From b4969bd7aa1aaf553b03d57c9e2b6a4d2c62a71c Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 19 Oct 2015 07:36:49 -0700 Subject: [PATCH 14/19] Bumping gaia.json for 6 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/e7d0c511bb83 Author: Carsten Book Desc: Merge pull request #32549 from Phoxygen/bug1216085-emergency-call_rtl_refactoring Bug 1216085 - [Emergency-call] Refacto CSS for RTL. r=gsvelto ======== https://hg.mozilla.org/integration/gaia-central/rev/981bf278f742 Author: Augustin Trancart Desc: Bug 1216085 - [Emergency-call] Refacto CSS for RTL. ======== https://hg.mozilla.org/integration/gaia-central/rev/0b58606b3298 Author: Carsten Book Desc: Merge pull request #32417 from Phoxygen/bug1209961-update_gaia_icons Bug 1209961 - Update gaia-icons in gaia. r=wilsonpage ======== https://hg.mozilla.org/integration/gaia-central/rev/9be62759b703 Author: Augustin Trancart Desc: Bug 1209961 - Update gaia-icons in gaia. It follows the new naming of icons in gaia-icons and uses bidi-helper.css when BiDi-proof icons are needed. ======== https://hg.mozilla.org/integration/gaia-central/rev/8cc9b3858213 Author: Ricky Chien Desc: Merge pull request #32510 from rickychien/reload-dependency Bug 1205257 - Spark distro does not rebuild fine from build.sh r=@julienw ======== https://hg.mozilla.org/integration/gaia-central/rev/e5ddf209619a Author: Ricky Chien Desc: Bug 1205257 - Spark distro does not rebuild fine from build.sh --- 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 bb87d16dcc2e..11bf2ca71da6 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "fca30ed2012307a21111aabafb9e181a4f7a6c46", + "git_revision": "3b4cd4e69f655867f23239c2b438e552358e409e", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "469c2040a2b522adfa2a37be49e3751dfb7ea5c7", + "revision": "e7d0c511bb83ab859ef98d6badcc0ea3bffa868e", "repo_path": "integration/gaia-central" } From 85c3896e70e4ea5eca77689cb121df62dddb0836 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 19 Oct 2015 07:39:44 -0700 Subject: [PATCH 15/19] Bumping manifests a=b2g-bump --- b2g/config/aries/sources.xml | 2 +- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator-l/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/nexus-4-kk/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/nexus-5-l/sources.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/aries/sources.xml b/b2g/config/aries/sources.xml index 51e64c038bc3..b81bdea037fe 100644 --- a/b2g/config/aries/sources.xml +++ b/b2g/config/aries/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 0824396d8c7e..0d9c386ea7f7 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 2c9e1e191819..73f10dbf325a 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 33a62edd9436..a276170fa341 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 00148851b566..53ef8a8516f6 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml index 8370aa081ec0..799574ae4f9a 100644 --- a/b2g/config/emulator-l/sources.xml +++ b/b2g/config/emulator-l/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 2c9e1e191819..73f10dbf325a 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index a383cd9ae005..d1ecdeb95f8f 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4-kk/sources.xml b/b2g/config/nexus-4-kk/sources.xml index 60d6dad1e479..c707d23d3aa1 100644 --- a/b2g/config/nexus-4-kk/sources.xml +++ b/b2g/config/nexus-4-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index a54123f6ae35..49a649454e56 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -18,7 +18,7 @@ - + diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml index 6114a7cb4ed8..85fd1ced3872 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From 8d77b34c6a71f9efdb308edb7765ef7d4858af95 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 19 Oct 2015 08:25:35 -0700 Subject: [PATCH 16/19] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/c1f403da51bf Author: Chris Lord Desc: Merge pull request #32562 from Cwiiis/bug1215967-paging-by-default-mistake Bug 1215967 - Fix home screen paging being enabled by default. r=gmarty ======== https://hg.mozilla.org/integration/gaia-central/rev/a26b2a7dc029 Author: Chris Lord Desc: Bug 1215967 - Fix home screen paging being enabled by default. r=gmarty --- 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 11bf2ca71da6..52069643621c 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "3b4cd4e69f655867f23239c2b438e552358e409e", + "git_revision": "48fe000e3a304e65f923a3195bdf34da15a490e9", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "e7d0c511bb83ab859ef98d6badcc0ea3bffa868e", + "revision": "c1f403da51bf8a212a1ce2f7d834b8c62387073d", "repo_path": "integration/gaia-central" } From 6d011edbd512a3c817a4c6667e31345029921b6c Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 19 Oct 2015 08:28:18 -0700 Subject: [PATCH 17/19] Bumping manifests a=b2g-bump --- b2g/config/aries/sources.xml | 2 +- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator-l/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/nexus-4-kk/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/nexus-5-l/sources.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/aries/sources.xml b/b2g/config/aries/sources.xml index b81bdea037fe..080f9cb5f4b2 100644 --- a/b2g/config/aries/sources.xml +++ b/b2g/config/aries/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 0d9c386ea7f7..ae594b3be01a 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 73f10dbf325a..a4be18617f99 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index a276170fa341..786649045cf5 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 53ef8a8516f6..41c26b33d43a 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml index 799574ae4f9a..e6e165e4e414 100644 --- a/b2g/config/emulator-l/sources.xml +++ b/b2g/config/emulator-l/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 73f10dbf325a..a4be18617f99 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index d1ecdeb95f8f..de793c174747 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4-kk/sources.xml b/b2g/config/nexus-4-kk/sources.xml index c707d23d3aa1..0b0f978c4a77 100644 --- a/b2g/config/nexus-4-kk/sources.xml +++ b/b2g/config/nexus-4-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 49a649454e56..520068cfb439 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -18,7 +18,7 @@ - + diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml index 85fd1ced3872..46216a23a11c 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From 5997909a93f4825c3bfdd19d5c25cc27e8b24285 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 19 Oct 2015 08:50:31 -0700 Subject: [PATCH 18/19] Bumping gaia.json for 2 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/6878d4020e3c Author: Marcus Cavanaugh Desc: Merge pull request #32485 from mcav/utility-tray-nest Bug 1209387 - Notification container scrolling in native-scrolling Ut… r=etienne ======== https://hg.mozilla.org/integration/gaia-central/rev/c2febf142731 Author: Marcus Cavanaugh Desc: Bug 1209387 - Notification container scrolling in native-scrolling UtilityTray causes tray to fling up due to nested scroll container momentum. --- 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 52069643621c..e23b043829cf 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "48fe000e3a304e65f923a3195bdf34da15a490e9", + "git_revision": "a87f947366c2e044bd6336e1982419ac45378969", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "c1f403da51bf8a212a1ce2f7d834b8c62387073d", + "revision": "6878d4020e3c1a3b020031cce83c4b437ad42669", "repo_path": "integration/gaia-central" } From d016d7e576071804a13106f9f9c45a3300928b61 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 19 Oct 2015 08:53:17 -0700 Subject: [PATCH 19/19] Bumping manifests a=b2g-bump --- b2g/config/aries/sources.xml | 2 +- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator-l/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/nexus-4-kk/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/nexus-5-l/sources.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/aries/sources.xml b/b2g/config/aries/sources.xml index 080f9cb5f4b2..6568be8767ae 100644 --- a/b2g/config/aries/sources.xml +++ b/b2g/config/aries/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index ae594b3be01a..31bc55e468da 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index a4be18617f99..747640323200 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 786649045cf5..9476128cfd6d 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 41c26b33d43a..bebb70efaee7 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml index e6e165e4e414..2c1d43bcb42c 100644 --- a/b2g/config/emulator-l/sources.xml +++ b/b2g/config/emulator-l/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index a4be18617f99..747640323200 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index de793c174747..302b6c8158ed 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4-kk/sources.xml b/b2g/config/nexus-4-kk/sources.xml index 0b0f978c4a77..492184a6a48c 100644 --- a/b2g/config/nexus-4-kk/sources.xml +++ b/b2g/config/nexus-4-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 520068cfb439..bd6a31a7edaf 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -18,7 +18,7 @@ - + diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml index 46216a23a11c..27f497f1160e 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - +