From ba7daa00e2d3f0123bf796f221a4cd2f39611f1a Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Sun, 4 May 2014 19:16:00 -0700 Subject: [PATCH 01/18] Bumping gaia.json for 4 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/9a6c98580372 Author: Timothy Guan-tin Chien Desc: Merge pull request #18865 from eeejay/bug-995026 Bug 995026 - Rename keyboard app title to localizable "Keyboard", r=timdream ======== https://hg.mozilla.org/integration/gaia-central/rev/02d4d8ecdff0 Author: Eitan Isaacson Desc: Bug 995026 - Rename keyboard app title to localizable "Keyboard". ======== https://hg.mozilla.org/integration/gaia-central/rev/6b8cb098f44b Author: evanxd Desc: Merge pull request #18241 from mpizza/Bug_995093_test_keyboard_launch Bug 995093 - Add a marionette test to check Keyboard app could show up correctly. ======== https://hg.mozilla.org/integration/gaia-central/rev/c7a95efbab38 Author: mpizza Desc: Bug 995093 - Add a marionette test to check Keyboard app could show up correctly. --- 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 9e97425f8a6..b526bcd7ab4 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "1b0c17f9088596cff6bcae64418ce45f91d64dec", + "revision": "9a6c985803729654d45a33909fbeac761855292b", "repo_path": "/integration/gaia-central" } From 28fcab7141f4246f3f81c3c583753587a186136b Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Sun, 4 May 2014 19:21:25 -0700 Subject: [PATCH 02/18] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index a8c3ec9cf99..0c38d9d8211 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 74f1df0a786..beb4d6733fb 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 a0c3b330a53..7c5b858929a 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/sources.xml b/b2g/config/emulator/sources.xml index a8c3ec9cf99..0c38d9d8211 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index 0bca8862d43..d680f4b4fa9 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -18,7 +18,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 53c3d224721..9aa8c4b8c98 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index c2d77659c48..ed9ecc22292 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index 396df077ae0..63eb6cad816 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index 431735aa77a..09ef5cae951 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index c3190666c3b..f992053bd9d 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 9ec335cb870..da6698f2d6e 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From bd4cb4c833a8149a5d28c0a38b6ebe3e6b710d11 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Sun, 4 May 2014 19:55:55 -0700 Subject: [PATCH 03/18] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/64bce0f41677 Author: Yoshi Huang Desc: Merge pull request #18378 from svic/Bug_959059 Bug 959059: Abort shrinkUI if P2P link is gone. r=alive ======== https://hg.mozilla.org/integration/gaia-central/rev/18f6ab3128c9 Author: Garner Lee Desc: Bug 959059: Abort Shrinking UI if P2P link is gone. r=alive --- 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 b526bcd7ab4..b79f608db3b 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "9a6c985803729654d45a33909fbeac761855292b", + "revision": "64bce0f41677ce5ac6a01aac8db56208af980a6d", "repo_path": "/integration/gaia-central" } From 8351b4de75b6b5619be3097eb22fa284d499e3ec Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Sun, 4 May 2014 20:01:21 -0700 Subject: [PATCH 04/18] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 0c38d9d8211..02718069f89 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 beb4d6733fb..517333d10e7 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 7c5b858929a..704e823cc19 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/sources.xml b/b2g/config/emulator/sources.xml index 0c38d9d8211..02718069f89 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index d680f4b4fa9..c78dc9556f2 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -18,7 +18,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 9aa8c4b8c98..a7d01caed19 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index ed9ecc22292..f5aa04ea99a 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index 63eb6cad816..704d8697d02 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index 09ef5cae951..5bfcb957548 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index f992053bd9d..79a84ec03e6 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index da6698f2d6e..064b9c7512e 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 597a2d63a2c190da99cb118431e010648feceaf4 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Sun, 4 May 2014 21:41:06 -0700 Subject: [PATCH 05/18] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/e64186458e9c Author: Luke Chang Desc: Merge pull request #18734 from luke-chang/1002377_stingray_homescreen_template Bug 1002377 - [Stingray] A template for the homescreen-stingray app, r=evelyn, r=johnhu ======== https://hg.mozilla.org/integration/gaia-central/rev/243ec4ec4a0d Author: Luke Chang Desc: Bug 1002377 - [Stingray] A template for the homescreen-stingray app --- 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 b79f608db3b..bc7c51a5402 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "64bce0f41677ce5ac6a01aac8db56208af980a6d", + "revision": "e64186458e9c64b00deace803d388f255cbfc3c4", "repo_path": "/integration/gaia-central" } From ef0c8632905e7e0fb5d048b2f33ffc2617e9d7b5 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Sun, 4 May 2014 21:46:31 -0700 Subject: [PATCH 06/18] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 02718069f89..fc8fba13fad 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 517333d10e7..391a819d127 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 704e823cc19..d046bbeea40 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/sources.xml b/b2g/config/emulator/sources.xml index 02718069f89..fc8fba13fad 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index c78dc9556f2..d53d4bf538a 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -18,7 +18,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index a7d01caed19..35c3d567c1f 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index f5aa04ea99a..16845ef65a2 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index 704d8697d02..60e9f1d35be 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index 5bfcb957548..12783d1eb0f 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index 79a84ec03e6..220b39589b3 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 064b9c7512e..10670af4dad 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 727b2b1f94dc2bc6b64b768032cdcdd55a59e6a8 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 5 May 2014 00:10:44 -0700 Subject: [PATCH 07/18] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/1eba06eba038 Author: Timothy Guan-tin Chien Desc: Merge pull request #18813 from timdream/truncate-app-name Bug 1003672 - Find app by it's first 15 letters in b2g-ps, r=yurenju ======== https://hg.mozilla.org/integration/gaia-central/rev/a4e1ac26f9f5 Author: Timothy Guan-tin Chien Desc: Bug 1003672 - Find app by it's first 15 letters in b2g-ps --- 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 bc7c51a5402..13e62cfb43a 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "e64186458e9c64b00deace803d388f255cbfc3c4", + "revision": "1eba06eba038add432265b75fde0dbc8ca5044c8", "repo_path": "/integration/gaia-central" } From fff5bc93d2fbf4c23a8a8dba564b82e4ba380233 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 5 May 2014 00:12:58 -0700 Subject: [PATCH 08/18] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index fc8fba13fad..3257929da3b 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 391a819d127..142c4f2afed 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 d046bbeea40..266134faffd 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/sources.xml b/b2g/config/emulator/sources.xml index fc8fba13fad..3257929da3b 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index d53d4bf538a..5a4ac3cb4a3 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -18,7 +18,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 35c3d567c1f..0ab5930a021 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index 16845ef65a2..b7bf9348448 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index 60e9f1d35be..c31aeb1daa5 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index 12783d1eb0f..d7cdaa9fecb 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index 220b39589b3..82173e0760c 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 10670af4dad..83d39486a24 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From befc9122f5c1f1cf016a44b5a51fd0d9697ff650 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 5 May 2014 00:51:09 -0700 Subject: [PATCH 09/18] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/90be083ad1f9 Author: Zibi Braniecki Desc: Merge pull request #18906 from zbraniecki/999193-mozl10n-cleanups-email Bug 999193 - Clean up bootstrap mozL10n API use in Email. r=jrburke ======== https://hg.mozilla.org/integration/gaia-central/rev/f1543933e57e Author: Zbigniew Braniecki Desc: Bug 999193 - Clean up bootstrap mozL10n API use in Email --- 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 13e62cfb43a..08ec5e68d13 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "1eba06eba038add432265b75fde0dbc8ca5044c8", + "revision": "90be083ad1f9f4007adfe02109062d1bff4a1b5d", "repo_path": "/integration/gaia-central" } From 2d3b113eb5ee7ceebe36ce1d497bc262db0f2960 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 5 May 2014 00:56:25 -0700 Subject: [PATCH 10/18] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 3257929da3b..1da5ec208fb 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 142c4f2afed..3ffddfa8877 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 266134faffd..e9eeb4188b5 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/sources.xml b/b2g/config/emulator/sources.xml index 3257929da3b..1da5ec208fb 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index 5a4ac3cb4a3..5ac4d06970f 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -18,7 +18,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 0ab5930a021..3fc66186f60 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index b7bf9348448..0aff9ae1d40 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index c31aeb1daa5..72bfcf355db 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index d7cdaa9fecb..5e1f05f7fd8 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index 82173e0760c..3149cdf31f5 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 83d39486a24..821d766fde6 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 8c34890c46c30e10d559c5d379d7ce4a194c5d7a Mon Sep 17 00:00:00 2001 From: Ben Tian Date: Mon, 5 May 2014 09:28:20 +0800 Subject: [PATCH 11/18] Bug 1003762 - [bluedroid] Notify BluetoothRilListener of service change, r=echou --- dom/bluetooth/bluedroid/hfp/BluetoothHfpManager.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dom/bluetooth/bluedroid/hfp/BluetoothHfpManager.cpp b/dom/bluetooth/bluedroid/hfp/BluetoothHfpManager.cpp index 71507f456f7..3276ae82d8e 100644 --- a/dom/bluetooth/bluedroid/hfp/BluetoothHfpManager.cpp +++ b/dom/bluetooth/bluedroid/hfp/BluetoothHfpManager.cpp @@ -897,6 +897,7 @@ BluetoothHfpManager::HandleVoiceConnectionChanged(uint32_t aClientId) voiceInfo->GetType(type); mPhoneType = GetPhoneType(type); + // Roam bool roaming; voiceInfo->GetRoaming(&roaming); mRoam = (roaming) ? 1 : 0; @@ -904,7 +905,13 @@ BluetoothHfpManager::HandleVoiceConnectionChanged(uint32_t aClientId) // Service nsString regState; voiceInfo->GetState(regState); - mService = (regState.EqualsLiteral("registered")) ? 1 : 0; + + int service = (regState.EqualsLiteral("registered")) ? 1 : 0; + if (service != mService) { + // Notify BluetoothRilListener of service change + mListener->ServiceChanged(aClientId, service); + } + mService = service; // Signal JSContext* cx = nsContentUtils::GetSafeJSContext(); From 3c549ca0f103fa0996db19f9b57098faada9535d Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 5 May 2014 01:01:16 -0700 Subject: [PATCH 12/18] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/f4c0db6cc208 Author: AndreiH Desc: Merge pull request #18925 from askeing/1005789 Bug 1005789 - Re-enable test_gallery_flick ======== https://hg.mozilla.org/integration/gaia-central/rev/862b3e775cca Author: askeing Desc: Bug 1005789 - Re-enable test_gallery_flick --- 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 08ec5e68d13..c197984d4d6 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "90be083ad1f9f4007adfe02109062d1bff4a1b5d", + "revision": "f4c0db6cc2087988799a70347a8bca3611d4ea4d", "repo_path": "/integration/gaia-central" } From c5d4bfcd015535ff0e718c74a3089b9ff80e0553 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 5 May 2014 01:06:12 -0700 Subject: [PATCH 13/18] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 1da5ec208fb..73419d1abfa 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 3ffddfa8877..c40ae287f0b 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 e9eeb4188b5..2cf89a71aaf 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/sources.xml b/b2g/config/emulator/sources.xml index 1da5ec208fb..73419d1abfa 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index 5ac4d06970f..8181528fccd 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -18,7 +18,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 3fc66186f60..f9b5c942984 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index 0aff9ae1d40..cec7f8c626c 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index 72bfcf355db..ed057f75c34 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index 5e1f05f7fd8..05465781cb8 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index 3149cdf31f5..285a88b2660 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 821d766fde6..39415acc974 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 603ca2129584d5f355dcb153ec19e19272734674 Mon Sep 17 00:00:00 2001 From: Alexandre Lissy Date: Fri, 2 May 2014 11:22:00 +0200 Subject: [PATCH 14/18] Bug 1005093 - Fix return code path of getNotificationURLFor(). r=fabrice --- b2g/components/AlertsHelper.jsm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/b2g/components/AlertsHelper.jsm b/b2g/components/AlertsHelper.jsm index 4dfe8ca829b..9260c1066af 100644 --- a/b2g/components/AlertsHelper.jsm +++ b/b2g/components/AlertsHelper.jsm @@ -178,8 +178,8 @@ let AlertsHelper = { return helper.fullLaunchPath(); } else if (typeof message === "object" && kNotificationSystemMessageName in message) { - return - helper.resolveFromOrigin(message[kNotificationSystemMessageName]); + return helper.resolveFromOrigin( + message[kNotificationSystemMessageName]); } } From be2e5a84a107da2401ebb0530336ea8c71d28318 Mon Sep 17 00:00:00 2001 From: Jared Wein Date: Sun, 4 May 2014 15:54:29 -0500 Subject: [PATCH 15/18] Bug 738797 - Enable the in-content preferences by default. r=Unfocused --- browser/app/profile/firefox.js | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js index 299518cfd40..8f77bdb1a21 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -787,11 +787,7 @@ pref("plugin.state.vidyoweb", 2); // display door hanger if flash not installed pref("plugins.notifyMissingFlash", true); -#ifdef XP_WIN -pref("browser.preferences.instantApply", false); -#else pref("browser.preferences.instantApply", true); -#endif #ifdef XP_MACOSX pref("browser.preferences.animateFadeIn", true); #else @@ -799,7 +795,7 @@ pref("browser.preferences.animateFadeIn", false); #endif // Toggles between the two Preferences implementations, pop-up window and in-content -pref("browser.preferences.inContent", false); +pref("browser.preferences.inContent", true); pref("browser.download.show_plugins_in_list", true); pref("browser.download.hide_plugins_without_extensions", true); From daa4d6d7871c78685975b7c624ec3306a8eeb56f Mon Sep 17 00:00:00 2001 From: Jared Wein Date: Sun, 4 May 2014 17:15:06 -0500 Subject: [PATCH 16/18] Backed out changeset 928eebe0592e (bug 738797) for failing browser_experiments.js. --- browser/app/profile/firefox.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js index 8f77bdb1a21..299518cfd40 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -787,7 +787,11 @@ pref("plugin.state.vidyoweb", 2); // display door hanger if flash not installed pref("plugins.notifyMissingFlash", true); +#ifdef XP_WIN +pref("browser.preferences.instantApply", false); +#else pref("browser.preferences.instantApply", true); +#endif #ifdef XP_MACOSX pref("browser.preferences.animateFadeIn", true); #else @@ -795,7 +799,7 @@ pref("browser.preferences.animateFadeIn", false); #endif // Toggles between the two Preferences implementations, pop-up window and in-content -pref("browser.preferences.inContent", true); +pref("browser.preferences.inContent", false); pref("browser.download.show_plugins_in_list", true); pref("browser.download.hide_plugins_without_extensions", true); From c2c2487f41450d035bb43ccac40612d1ae6496a5 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 5 May 2014 02:10:52 -0700 Subject: [PATCH 17/18] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/3cb56b927c76 Author: Cristian Rodriguez Desc: Merge pull request #18883 from crdlc/bug-1003787 Bug 1003787 - [Contacts] Different texts to delete contacts: Delete X co... ======== https://hg.mozilla.org/integration/gaia-central/rev/a6acb4efcc8a Author: crdlc Desc: Bug 1003787 - [Contacts] Different texts to delete contacts: Delete X contact?.. in title and text Remove in button --- 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 c197984d4d6..4b74ed73887 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "f4c0db6cc2087988799a70347a8bca3611d4ea4d", + "revision": "3cb56b927c764ceca3c305a12d70eb24af062e92", "repo_path": "/integration/gaia-central" } From c1a7430d266c2f5aba1c7712e649844dfbc2e77b Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 5 May 2014 02:16:26 -0700 Subject: [PATCH 18/18] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 73419d1abfa..738902c0b28 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 c40ae287f0b..c675da86828 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 2cf89a71aaf..15e768dcf6f 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/sources.xml b/b2g/config/emulator/sources.xml index 73419d1abfa..738902c0b28 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index 8181528fccd..c88df55867f 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -18,7 +18,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index f9b5c942984..f999668c27e 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index cec7f8c626c..2ec79ec0c27 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index ed057f75c34..fb5f7f1fdb5 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index 05465781cb8..e45a548d702 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index 285a88b2660..824e1a503d5 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 39415acc974..0bcf2b38034 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - +