Bug 1080312 - Update iteration code from upstream. r=jesup, a=2.0+
Bumping gaia.json for 7 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-2_0/rev/e30f84943825
Author: Jim <jporter@mozilla.com>
Desc: Bug 1091137 - [ringtones] Fix clearing out the tonePlayer's state when hiding the app

Conflicts:
	apps/ringtones/js/tone_player.js

========

https://hg.mozilla.org/integration/gaia-2_0/rev/c8f924a06bb0
Author: Luke Chang <lchang@mozilla.com>
Desc: Bug 1083053 - [Midori] The screenshot preview window still overlays an app when switching apps

========

https://hg.mozilla.org/integration/gaia-2_0/rev/8148107c84d1
Author: Salvador de la Puente <salva@unoyunodiez.com>
Desc: Bug 1043762 - Volume buttons don't do anything in Settings and previewing new ringtones

========

https://hg.mozilla.org/integration/gaia-2_0/rev/7ca6c0a85945
Author: ian-liu <iliu@mozilla.com>
Desc: Bug 1085201 - [Flame][Tako][v2.1][Settings] "Searching device" not hidden as Sony SBH50 BTHS paired via NFC

========

https://hg.mozilla.org/integration/gaia-2_0/rev/de744bca49a0
Author: Dominic Kuo <dkuo@mozilla.com>
Desc: Bug 1048673 - [Ringtones] stop the previews before leaving the app

========

https://hg.mozilla.org/integration/gaia-2_0/rev/04452c26fc43
Author: Ryan VanderMeulen <ryanvm@gmail.com>
Desc: Merge pull request #25990 from snowmantw/bug1089529-2.0

Bug 1089529 - Lockscreen error after screen off and on when device shows...

========

https://hg.mozilla.org/integration/gaia-2_0/rev/ee115df90690
Author: Greg Weng <snowmantw@gmail.com>
Desc: Bug 1089529 - Lockscreen error after screen off and on when device shows NFC shrinking UI
Bumping manifests a=b2g-bump
Bug 978211 - add an automation/build target for post-build steps; r=glandium a=NPOTB
Bug 978211 - Seemlessly support make 4 output buffering for automation/% steps. r=mshal a=NPOTB
Bug 978211 - enable MOZ_AUTOMATION_* flags in linux mozconfigs; r=glandium a=NPOTB
Bug 1030717 -  Don't try to create the mach state directory until it's actually needed. r=gps a=NPOTB
Bug 978211 - add 'pretty' targets for automation; r=glandium a=NPOTB
Bug 1036566 - use 'mkdir -p' before packaging tests; r=gps a=NPOTB
Bug 1036569 - Fix NSS_STATIC_LIBS with carriage return on Windows; r=glandium a=NPOTB
Bug 1036093 - ignore mach exceptions when printing binary paths; r=gps a=NPOTB
Bug 978211 - Windows configs; r=glandium a=NPOTB
Bug 978211 - OSX automation configs; r=glandium a=NPOTB
Bug 978211 - various asan/mar/pretty/mach fixes; r=glandium a=NPOTB

 - Linux ASAN nightly builds do not do update packaging
 - Only set mar properties if the mar file was actually created
 - Unset MOZ_SIGN_CMD for pretty-* steps
Bug 978211 - run make from mach without a shell; r=gps a=NPOTB
Bug 978211 followup, make compare-mozconfig work on Win64 again, r=glandium a=NPOTB

--HG--
extra : rebase_source : 615a26cc88c663b1c4b1b8ad7b32e3107962f019
Bug 1072073 - pretty-l10n-check should also be -j1; r=glandium a=NPOTB
Bug 1013730 - Have mach ignore broken disk io stats; r=gps a=NPOTB

This works around the "RuntimeError: couldn't find any physical disk"
issue on Windows when using 'diskperf -n'
Bug 1077597 - force -j1 for {pretty-}package-tests; r=glandium a=NPOTB
Bug 1084163 - Remove 'make check' from automation/build; r=glandium a=NPOTB

'make check' is somewhat special in that we want to trigger testers
before it finishes. Since moving sendchange into mach is difficult and
'make check' may be going away in the future anyway, just pull it out
for now.

Also remove the MOZ_AUTOMATION_*_SENDCHANGE flags since we aren't using
them.