3361a93b21f0c3e2e848fd3f59dd6073204d5126: Merge m-c to b2g-inbound.
Ryan VanderMeulen <ryanvm@gmail.com> - Tue, 01 Apr 2014 16:48:07 -0400 - rev 176634
Push 26528 by cbook@mozilla.com at Wed, 02 Apr 2014 13:58:11 +0000
Merge m-c to b2g-inbound.
ce9a329fc4a2a3d7cbc73cd128beef4bc0f957f6: Bumping manifests a=b2g-bump
B2G Bumper Bot <release+b2gbumper@mozilla.com> - Tue, 01 Apr 2014 13:46:23 -0700 - rev 176633
Push 26528 by cbook@mozilla.com at Wed, 02 Apr 2014 13:58:11 +0000
Bumping manifests a=b2g-bump
6248d499e46e1951772c8f1a93f0a07e18f2f2d4: Bumping gaia.json for 3 gaia revision(s) a=gaia-bump
B2G Bumper Bot <release+b2gbumper@mozilla.com> - Tue, 01 Apr 2014 13:41:12 -0700 - rev 176632
Push 26528 by cbook@mozilla.com at Wed, 02 Apr 2014 13:58:11 +0000
Bumping gaia.json for 3 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/3e02a62830e2 Author: Ryan VanderMeulen <rvandermeulen@mozilla.com> Desc: Merge pull request #17846 from evanxd/bug-990334 Bug 990334 - [Calendar] Newly perma-red marionette test, marionette/today_test.js ======== https://hg.mozilla.org/integration/gaia-central/rev/4de830af5256 Author: Evan Xd <itoyxd@gmail.com> Desc: Bug 990334 - Set the correct css selector for the current day item. ======== https://hg.mozilla.org/integration/gaia-central/rev/8ecb619a76fa Author: Michael Henretty <michael.henretty@gmail.com> Desc: Revert "Merge pull request #16183 from mcav/alarm-volume" This reverts commit bb7e44e428640f15e1c07b0ab89c712e797fb9ea, reversing changes made to 6274b3645b3d41df4aa5a55398b5d106edf1c528.
5aa752056666ae30fe0611394992a22849b302cb: Bumping manifests a=b2g-bump
B2G Bumper Bot <release+b2gbumper@mozilla.com> - Tue, 01 Apr 2014 13:36:13 -0700 - rev 176631
Push 26528 by cbook@mozilla.com at Wed, 02 Apr 2014 13:58:11 +0000
Bumping manifests a=b2g-bump
8ec8c38731813417932f326566bf88a13c9e6ef3: Bumping gaia.json for 3 gaia revision(s) a=gaia-bump
B2G Bumper Bot <release+b2gbumper@mozilla.com> - Tue, 01 Apr 2014 13:31:10 -0700 - rev 176630
Push 26528 by cbook@mozilla.com at Wed, 02 Apr 2014 13:58:11 +0000
Bumping gaia.json for 3 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/fca93ff8ee10 Author: Miller Medeiros <miller@millermedeiros.com> Desc: Merge pull request #17831 from millermedeiros/989785-backout-duplicated-dom Bug 989785 - apps/calendar/test/marionette/week_view_test.js failing because of week view regression r=gaye ======== https://hg.mozilla.org/integration/gaia-central/rev/1d65adac71b0 Author: Miller Medeiros <miller@millermedeiros.com> Desc: Bug 989785 - apps/calendar/test/marionette/week_view_test.js failing because of week view regression ======== https://hg.mozilla.org/integration/gaia-central/rev/369a20a696bf Author: Miller Medeiros <miller@millermedeiros.com> Desc: Revert "Bug 988079 - [Calendar] day view sometimes adds duplicated days to the DOM" This reverts commit 277ef605c8f8305fe91a65559bfe35ca3458852b. Conflicts: apps/calendar/test/marionette/day_view_test.js apps/calendar/test/unit/views/day_test.js
275feb8db98a6cd42dd3756b418a1f73cf40ee90: Bumping manifests a=b2g-bump
B2G Bumper Bot <release+b2gbumper@mozilla.com> - Tue, 01 Apr 2014 12:16:07 -0700 - rev 176629
Push 26528 by cbook@mozilla.com at Wed, 02 Apr 2014 13:58:11 +0000
Bumping manifests a=b2g-bump
cb4fdc0d9567eae496d27bfe437da43715f7c7da: Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
B2G Bumper Bot <release+b2gbumper@mozilla.com> - Tue, 01 Apr 2014 12:11:16 -0700 - rev 176628
Push 26528 by cbook@mozilla.com at Wed, 02 Apr 2014 13:58:11 +0000
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/cd17998374ac Author: Marcus Cavanaugh <m@mcav.com> Desc: Merge pull request #16183 from mcav/alarm-volume Bug 939197 - [Clock] Alarms need volume control. r=millermedeiros ======== https://hg.mozilla.org/integration/gaia-central/rev/6b7614d99840 Author: Marcus Cavanaugh <m@mcav.com> Desc: Bug 939197 - [Clock] Alarms need volume control. r=millermedeiros
80dcb8e4696453ac52e11cd711c06be3e91ca492: merge fx-team to mozilla-central
Carsten "Tomcat" Book <cbook@mozilla.com> - Wed, 02 Apr 2014 15:56:06 +0200 - rev 176627
Push 26527 by cbook@mozilla.com at Wed, 02 Apr 2014 13:56:22 +0000
merge fx-team to mozilla-central
280b1db44f63129726d7b4cb9fa875e26132c9a7: Backed out changeset 535756591289 (bug 939040) for ticking an assertion after the latest m-c merge; CLOSED TREE
Ed Morley <emorley@mozilla.com> - Wed, 02 Apr 2014 09:29:16 +0100 - rev 176626
Push 26527 by cbook@mozilla.com at Wed, 02 Apr 2014 13:56:22 +0000
Backed out changeset 535756591289 (bug 939040) for ticking an assertion after the latest m-c merge; CLOSED TREE
523e67cf4b9e63fea48cd8147b2521f7e78086f5: Bug 990116 - Post: Clean Robocop imports. r=trivial
Nick Alexander <nalexander@mozilla.com> - Tue, 01 Apr 2014 22:00:47 -0700 - rev 176625
Push 26527 by cbook@mozilla.com at Wed, 02 Apr 2014 13:56:22 +0000
Bug 990116 - Post: Clean Robocop imports. r=trivial
3a9374b328cfc88837361be37b09f0ef94bdd20e: Bug 990116 - Part 4: Make UITest inherit from BaseRobocopTest. r=mcomella
Nick Alexander <nalexander@mozilla.com> - Tue, 01 Apr 2014 22:00:47 -0700 - rev 176624
Push 26527 by cbook@mozilla.com at Wed, 02 Apr 2014 13:56:22 +0000
Bug 990116 - Part 4: Make UITest inherit from BaseRobocopTest. r=mcomella
49cb824b0da407507cf912b80ddbdd8d50795c26: Bug 990116 - Part 3: Use BROWSER_INTENT_CLASS in browser JUnit 3 tests. r=mcomella
Nick Alexander <nalexander@mozilla.com> - Tue, 01 Apr 2014 22:00:46 -0700 - rev 176623
Push 26527 by cbook@mozilla.com at Wed, 02 Apr 2014 13:56:22 +0000
Bug 990116 - Part 3: Use BROWSER_INTENT_CLASS in browser JUnit 3 tests. r=mcomella
ee4e3900536c9f089f38c42e06eee902fc2ff749: Bug 990116 - Part 2: Use BROWSER_INTENT_CLASS in Robocop tests. r=mcomella
Nick Alexander <nalexander@mozilla.com> - Tue, 01 Apr 2014 22:00:46 -0700 - rev 176622
Push 26527 by cbook@mozilla.com at Wed, 02 Apr 2014 13:56:22 +0000
Bug 990116 - Part 2: Use BROWSER_INTENT_CLASS in Robocop tests. r=mcomella
95a86df2317f7714287c2ef88321433f7e902d46: Bug 990116 - Part 1: Split BROWSER_INTENT_CLASS and BROWSER_INTENT_CLASS_NAME. r=mcomella
Nick Alexander <nalexander@mozilla.com> - Tue, 01 Apr 2014 22:00:46 -0700 - rev 176621
Push 26527 by cbook@mozilla.com at Wed, 02 Apr 2014 13:56:22 +0000
Bug 990116 - Part 1: Split BROWSER_INTENT_CLASS and BROWSER_INTENT_CLASS_NAME. r=mcomella
8fff417c783128819dbf5bed0898417e6fe6b389: Bug 990116 - Part 0: Move UITest.Type to BaseRobocopTest. r=mcomella
Nick Alexander <nalexander@mozilla.com> - Tue, 01 Apr 2014 22:00:45 -0700 - rev 176620
Push 26527 by cbook@mozilla.com at Wed, 02 Apr 2014 13:56:22 +0000
Bug 990116 - Part 0: Move UITest.Type to BaseRobocopTest. r=mcomella
77e6546f5460d45f77c665e3a990fe01ba5d2d93: Bug 990116 - Pre: Remove UITest.mActivity. r=mcomella
Nick Alexander <nalexander@mozilla.com> - Tue, 01 Apr 2014 22:00:45 -0700 - rev 176619
Push 26527 by cbook@mozilla.com at Wed, 02 Apr 2014 13:56:22 +0000
Bug 990116 - Pre: Remove UITest.mActivity. r=mcomella
94fa2e17d41808d0f2d1f89f1f4a339136b9d6fa: Bug 990872 - Eliminate Places dependency in Sync utils. r=gps
Richard Newman <rnewman@mozilla.com> - Tue, 01 Apr 2014 21:33:42 -0700 - rev 176618
Push 26527 by cbook@mozilla.com at Wed, 02 Apr 2014 13:56:22 +0000
Bug 990872 - Eliminate Places dependency in Sync utils. r=gps
8c483fd63cadc80a8ac9b21acac8030757225bbc: Bug 988437 - Part 2: Make Firefox Account Android Account type unique per package. r=rnewman
Nick Alexander <nalexander@mozilla.com> - Tue, 01 Apr 2014 21:32:54 -0700 - rev 176617
Push 26527 by cbook@mozilla.com at Wed, 02 Apr 2014 13:56:22 +0000
Bug 988437 - Part 2: Make Firefox Account Android Account type unique per package. r=rnewman This bumps every package's account type so that any issues shake out on Nightly (which otherwise would not have experienced an account type change). The trivial change to the AndroidManifest is to ensure that the new Account type is picked up by the build system, in the hopes of avoiding a clobber.
6f78648a91a0d6fe147c7c907255bf2964a51bfa: Bug 988437 - Part 1: Allow unpickling across Android Account types; bump pickle version. r=rnewman
Nick Alexander <nalexander@mozilla.com> - Tue, 01 Apr 2014 21:32:54 -0700 - rev 176616
Push 26527 by cbook@mozilla.com at Wed, 02 Apr 2014 13:56:22 +0000
Bug 988437 - Part 1: Allow unpickling across Android Account types; bump pickle version. r=rnewman
0217e524f8b9a0a6924af0b65eccdf06438c4568: Merge m-c to inbound to fix the CLOSED TREE
Wes Kocher <wkocher@mozilla.com> - Tue, 01 Apr 2014 16:47:39 -0700 - rev 176615
Push 26527 by cbook@mozilla.com at Wed, 02 Apr 2014 13:56:22 +0000
Merge m-c to inbound to fix the CLOSED TREE
(0) -100000 -30000 -10000 -3000 -1000 -300 -100 -50 -20 +20 +50 +100 +300 +1000 +3000 +10000 +30000 +100000 +300000 tip