Bug 979450: Add emulator-kk to bumper. r=bhearsum
Bug 979440 - we can't call get_output_from_command() from inside setup_mock()
Bug 979584 - Increase timeout for Gaia UI emulator builds on buildbot. r=jgriffin
Bug 979963 - Install B2G using mozinstall, r=ahal
backout 86027af6a98f: bug Bug 979440
merge backout 02c74aa31b51 commit -> default
Bug 979963 - Fix binary path for gaia unit tests
Bug 979963 - Fix binary path for gaia integration tests
Bug 979963 - binary -> binary_path
Merging from default

changeset:   2486:0da409dc84de
parent:      2484:78525c41173f
user:        Chris AtLee <catlee@mozilla.com>
date:        Tue Mar 04 17:45:31 2014 -0500
summary:     Bug 979450: Add emulator-kk to bumper. r=bhearsum

changeset:   2487:86027af6a98f
user:        Jordan Lund <jlund@mozilla.com>
date:        Tue Mar 04 21:50:37 2014 -0800
summary:     Bug 979440 - we can't call get_output_from_command() from inside setup_mock()

changeset:   2488:0cfcff7aa533
user:        Dave Hunt <dhunt@mozilla.com>
date:        Wed Mar 05 09:00:33 2014 +0000
summary:     Bug 979584 - Increase timeout for Gaia UI emulator builds on buildbot. r=jgriffin

changeset:   2490:e249a282f000
parent:      2488:0cfcff7aa533
user:        Jonathan Griffin <jgriffin@mozilla.com>
date:        Wed Mar 05 13:22:31 2014 -0800
summary:     Bug 979963 - Install B2G using mozinstall, r=ahal

changeset:   2491:02c74aa31b51
parent:      2487:86027af6a98f
user:        Jordan Lund <jlund@mozilla.com>
date:        Wed Mar 05 14:11:26 2014 -0800
summary:     backout 86027af6a98f: bug Bug 979440

changeset:   2492:9eb21b200bc4
parent:      2490:e249a282f000
parent:      2491:02c74aa31b51
user:        Jordan Lund <jlund@mozilla.com>
date:        Wed Mar 05 14:30:03 2014 -0800
summary:     merge backout 02c74aa31b51 commit -> default

changeset:   2493:ac55ee2e3e07
user:        Jonathan Griffin <jgriffin@mozilla.com>
date:        Wed Mar 05 16:17:29 2014 -0800
summary:     Bug 979963 - Fix binary path for gaia unit tests

changeset:   2494:b42d424bc1ad
user:        Jonathan Griffin <jgriffin@mozilla.com>
date:        Wed Mar 05 16:18:42 2014 -0800
summary:     Bug 979963 - Fix binary path for gaia integration tests

changeset:   2495:bf050bb8b3a0
tag:         tip
user:        Jonathan Griffin <jgriffin@mozilla.com>
date:        Wed Mar 05 16:26:39 2014 -0800
summary:     Bug 979963 - binary -> binary_path

--HG--
branch : production