Bug 777354 - Make httpd.js shutdown quickly with idle never used sockets. r=jduell, a=test-only
Bug 754356 - Remove TLS intolerance timeout logic. r=honzab, a=lsblakk
Bumping gaia.json for 1 gaia-1_2 revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-1_2/rev/470dbad83379
Author: Arthur Chen <crh0716@gmail.com>
Desc: Revert "Merge pull request #13158 from crh0716/911701"

This reverts commit a309c93dcef94552cded8a183740ce44d6c1fc7e.
Bumping gaia.json for 1 gaia-1_2 revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-1_2/rev/158dd6157484
Author: Arthur Chen <crh0716@gmail.com>
Desc: Bug 912020 - Save to settings DB when leaving the panel

Conflicts:
	apps/settings/js/settings.js
Bumping gaia.json for 2 gaia-1_2 revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-1_2/rev/f79b01c16580
Author: Zac <zcampbell@mozilla.com>
Desc: Merge pull request #13347 from AndreiH/v1.2-picker

Bug 932250 - Write a test for context menu activity picker on aurora

========

https://hg.mozilla.org/integration/gaia-1_2/rev/e5cc94f20837
Author: Andrei Hutusoru <andreihutusoru@P5069.(none)>
Desc: Bug 932250 - Write a test for context menu activity picker on aurora
Bug 862899 - AudioChannelAgent in the FMRadio API. r=mchen, r=khuey, a=koi+
Bug 932843 - Allow the installation of operator packaged apps without network connection. r=fabrice, a=koi+
Merge m-b to b2g26. a=merge
Bumping gaia.json for 5 gaia-1_2 revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-1_2/rev/be92f5ad7c5d
Author: Florin Strugariu <bebef_1987@yahoo.com>
Desc: Merge pull request #13320 from bobsilverberg/cp927029

Bug 934227 - [v1.2] Uplift contact import and export tests from master

========

https://hg.mozilla.org/integration/gaia-1_2/rev/56bb5020afc4
Author: Bob Silverberg <bob.silverberg@gmail.com>
Desc: Bug 927029 - Write a test for exporting contacts to SD Card, r=zac

Conflicts:
	tests/python/gaia-ui-tests/gaiatest/gaia_test.py

========

https://hg.mozilla.org/integration/gaia-1_2/rev/12258448a912
Author: AlinT <trifandreialin@gmail.com>
Desc: Bug 927348 - Write a test to import from VCF file on SD card

========

https://hg.mozilla.org/integration/gaia-1_2/rev/83c8b05f1405
Author: Bob Silverberg <bob.silverberg@gmail.com>
Desc: Merge pull request #13330 from bobsilverberg/cp932385

Bug 932385 - Calling moztelephony.active is hanging the device, try UI level solution instead

========

https://hg.mozilla.org/integration/gaia-1_2/rev/3d1edca836cd
Author: Zac Campbell <zcampbell@mozilla.com>
Desc: Bug 932385 - Calling moztelephony.active is hanging the device, try UI level solution instead
Bumping gaia.json for 2 gaia-1_2 revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-1_2/rev/36f568ca93e4
Author: Florin Strugariu <bebef_1987@yahoo.com>
Desc: Merge pull request #13382 from bobsilverberg/cp934940

Bug 934940 - Python update test flow to accomodate html changes

========

https://hg.mozilla.org/integration/gaia-1_2/rev/21684ecd46a3
Author: Zac Campbell <zcampbell@mozilla.com>
Desc: Bug 934940 - Python update test flow to accomodate html changes

Conflicts:
	tests/python/gaia-ui-tests/gaiatest/tests/functional/messages/manifest.ini
Bug 920595 - Mochitest for verifying state transitions in Media Recording API. r=roc, a=test-only
Backed out changeset 9054fd176f74 (bug 920595) for landing without dependencies landing first. a=backout
DONTBUILD
Bumping gaia.json for 4 gaia-1_2 revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-1_2/rev/8a550f11cf1b
Author: Corey Frang <gnarf37@gmail.com>
Desc: Bug 933282 - Dead spot in alarm-item label - r=jugglinmike

- Add pointer-events: none; and overflow: hidden; to the container for the analog clock to stop the rotating second hand from having its box flow over the clickable region for the alarm edit

========

https://hg.mozilla.org/integration/gaia-1_2/rev/747e5062e84d
Author: Zac Campbell <zcampbell@mozilla.com>
Desc: Bug 927348 - Python test import contacts from sim, repair typo in manifest file r=zac a=testonly

========

https://hg.mozilla.org/integration/gaia-1_2/rev/b89fb926b62b
Author: Zac <zcampbell@mozilla.com>
Desc: Merge pull request #13386 from bobsilverberg/v1.2e.me

Bug 935066 - [v1.2] Fix and enable everything.me tests on v1.2

========

https://hg.mozilla.org/integration/gaia-1_2/rev/576e5f89a7c8
Author: Bob Silverberg <bob.silverberg@gmail.com>
Desc: Bug 935066 - [v1.2] Fix and enable everything.me tests on v1.2
Bumping gaia.json for 1 gaia-1_2 revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-1_2/rev/d89a05c2d17b
Author: Rick Waldron <waldron.rick@gmail.com>
Desc: Bug 920546 - [Messages] Short-term fixes for the recipient panel r=julienw

https://bugzilla.mozilla.org/show_bug.cgi?id=920546

- Apply new "invalid recipient" indicator style
- Decouple searchContact from list display
- Create ThreadUI.listContact(...)
- Create ThreadUI.validateContact(...)
- Adds two level validation:
    - Is the entry questionable?
        - This kicks off a silent search for matching contacts
        - If there are one or more matches, use the first to create a Recipient
    - Is the entry invalid?
        - This state is reached if no contacts could be found
          for the typed value.
        - Prevents enableSend
        - Prevents "export" of recipient entry at Send
          (when mixed with multiple valid recipients)
- Refactor Utils.getContactDisplayInfo logic
- Adds tests for enableSend
- Adds tests for questionable Recipient detection.

Cases covered: https://bugzilla.mozilla.org/show_bug.cgi?id=920546#c48

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
Bumping gaia.json for 1 gaia-1_2 revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-1_2/rev/705d123deba5
Author: Julien Wajsberg <felash@gmail.com>
Desc: Merge pull request #13354 from julienw/924475-master-fix

Bug 924475 - [Messages] The context menu is missing the contact name and...(cherry picked from commit 55977f034e24c9386af1c92a3eed53a92d901a33)

Conflicts:
	apps/sms/test/unit/thread_ui_test.js
Bug 904298 - Implement mozilla::{AssertAppPrincipal,CheckPermission}. r=sicking, a=koi+
Bumping gaia.json for 2 gaia-1_2 revision(s) a=gaia-bump
Truncated some number of revisions since the previous bump.

========

https://hg.mozilla.org/integration/gaia-1_2/rev/e009d139af8c
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Merge pull request #13394 from davidflanagan/bug915001v1.2

Merge pull request #13300 from davidflanagan/bug915001hd

========

https://hg.mozilla.org/integration/gaia-1_2/rev/b76641e76fad
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Merge pull request #13300 from davidflanagan/bug915001hd

Bug 915001 - save edited images using tiles and display a progress bar r=hshih(cherry picked from commit d19550e2fb7331d5e4a54e8e998753378e7fd44a)

Conflicts:

	apps/gallery/index.html
Bumping gaia.json for 1 gaia-1_2 revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-1_2/rev/3e85fc2fce6d
Author: Arthur Chen <crh0716@gmail.com>
Desc: Merge pull request #13375 from crh0716/911701_1

Bug 911701 - Show data signal strength when connecting to EVDO r=alive(cherry picked from commit c83556b20bf42aea6e80b1987a91a631e401f1b8)
Bumping gaia.json for 2 gaia-1_2 revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-1_2/rev/066f020ddb93
Author: Zac <zcampbell@mozilla.com>
Desc: Merge pull request #13332 from bobsilverberg/v1.2manifest

Bug 934230 - [v1.2] Update all manifest files to be in line with master

========

https://hg.mozilla.org/integration/gaia-1_2/rev/0f858679f8be
Author: Zac Campbell <zcampbell@mozilla.com>
Desc: Bug 934230 - [v1.2] Update all manifest files to be in line with master