Bumping manifests a=b2g-bump
Bug 1072877 - Ensure OOP transactions can't use memory backed tile locks. r=bjacob, a=2.1+
Bug 994292 - Call SpecialPowers.pushPermissions() to ensure permission change is completed before continuing the rest of the tests. r=baku, a=test-only
Bug 1025040 - Disable test_single_finger_desktop.py on Windows for frequent failures. a=test-only
Bug 989168 - Disable browser_manifest_editor. r=jryans, a=test-only
Bug 1074030 - Copy the OS X overlay scrollbar fade parameters to B2G. r=fabrice, a=bajaj
Bug 1068468 - Truncate ssid if its length of encoded to utf8 is longer than 32. r=chulee, a=bajaj
Bumping gaia.json for 12 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-2_1/rev/0a3854f415ce
Author: Salvador de la Puente <salva@unoyunodiez.com>
Desc: Bug 1054570 - Cursor is set to the beginning of the password field after it has been shown as plain text

========

https://hg.mozilla.org/integration/gaia-2_1/rev/22537a00e94c
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1074417 - [Search] Search translanted app names for query r=daleharvey

========

https://hg.mozilla.org/integration/gaia-2_1/rev/96b94707e20e
Author: Jocelyn Liu <joliu@mozilla.com>
Desc: Bug 1074152: Handle discoverystatechanged event in bluetooth app.

========

https://hg.mozilla.org/integration/gaia-2_1/rev/ddeb1f8216b0
Author: Andrew Sutherland <asutherland@asutherland.org>
Desc: Bug 1068116 - [email/POP3] email.js POP3 attachment regressions: binary attachments are corrupted on download and partially downloaded attachments are saved to disk. r=mcav

land https://github.com/mozilla-b2g/gaia-email-libs-and-more/pull/342 in gaia

========

https://hg.mozilla.org/integration/gaia-2_1/rev/d5c711c7b96c
Author: albertopq <apastor@mozilla.com>
Desc: Bug 1074352 - Listen to titlestatechanged on ftu

========

https://hg.mozilla.org/integration/gaia-2_1/rev/a289d07e48d1
Author: Michael Henretty <michael.henretty@gmail.com>
Desc: Bug 1074569 - Always use black background for fullscreen layout software home button

========

https://hg.mozilla.org/integration/gaia-2_1/rev/09d216dcedd1
Author: Michael Henretty <michael.henretty@gmail.com>
Desc: Bug 1074580 - Do not display fullscreen home button when in fullscreen layout

========

https://hg.mozilla.org/integration/gaia-2_1/rev/a86f912d5697
Author: Aleh Zasypkin <azasypkin@mozilla.com>
Desc: Bug 1074790 - [Messages] We should revoke contact image blob URL when contact or its image is removed. r=julien

========

https://hg.mozilla.org/integration/gaia-2_1/rev/73c9375b310b
Author: Punam Dahiya <punamdahiya@yahoo.com>
Desc: Bug1072013-[Video]-Opening the video app or tapping the camera icon will cause a white screen transition r=hub

========

https://hg.mozilla.org/integration/gaia-2_1/rev/0d75b243c2cc
Author: albertopq <apastor@mozilla.com>
Desc: Bug 1007948 - SIM Error message disappears on iccinfochange

========

https://hg.mozilla.org/integration/gaia-2_1/rev/b62d943c42ae
Author: Ryan VanderMeulen <ryanvm@gmail.com>
Desc: Merge pull request #24719 from nullaus/v2.1

Merge pull request #24524 from nullaus/bug1074043

========

https://hg.mozilla.org/integration/gaia-2_1/rev/3c9c42267cad
Author: Ghislain 'Aus' Lacroix <aus@noiseport.org>
Desc: Merge pull request #24524 from nullaus/bug1074043

bug 1074043 - Listen for new activities and adjust titlebar styling as e...
(cherry picked from commit 22b1698a71db620b1dd04867aba55efbfd9f23d7)
Bumping manifests a=b2g-bump
Bumping gaia.json for 1 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-2_1/rev/a41b8b4d0f8e
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1071943 - Disable intermittent failing test, TEST-UNEXPECTED-FAIL | /builds/slave/test/gaia/apps/communications/contacts/test/mar
ionette/ice_test.js | Contacts > ICE contacts ICE contacts Select ICE contact from search, go back to ICE settings a=nbotb
Bumping manifests a=b2g-bump
Backed out changeset 27cb26c18799 (bug 1064669). r=mfinkle a=bustage
Bumping gaia.json for 1 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-2_1/rev/675a477b8c31
Author: Guillaume Marty <edo999@gmail.com>
Desc: Follow up on Bug 1057977 - [Status Bar] Remove AM/PM indicator

Conflicts:
	build/config/common-settings.json
Bumping manifests a=b2g-bump
Bug 1072491 - Make GrallocTextureHost more robust against some invalid states. r=sotaro, a=sledru
Bug 1066410 - Serious color distortion happened when plays WebRTC. r=jesup, a=bajaj
Bug 1064800 - Catch exception from sending message to prevent interrupting execution. r=khuey, a=bajaj
Bumping gaia.json for 7 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-2_1/rev/9143c3e581e0
Author: Russ Nicoletti <rnicoletti@mozilla.com>
Desc: Bug 1071787 [SMS] "Go to Camera" button cancels popup when attempting to attach a video with no videos on device

========

https://hg.mozilla.org/integration/gaia-2_1/rev/79183b167555
Author: Ryan VanderMeulen <ryanvm@gmail.com>
Desc: Merge pull request #24686 from crdlc/bug-1061422

Bug 1061422 - [Contacts] ICE can be set to a contact without number

========

https://hg.mozilla.org/integration/gaia-2_1/rev/87b7c5b4b048
Author: crdlc <crdlc@tid.es>
Desc: Bug 1061422 - [Contacts] ICE can be set to a contact without number

========

https://hg.mozilla.org/integration/gaia-2_1/rev/2258e0f63418
Author: Ryan VanderMeulen <ryanvm@gmail.com>
Desc: Merge pull request #24533 from KevinGrandon/bug_1074512_to_two_dot_one

Bug 1074512 - [TaskManager] Allow search app role in filter

========

https://hg.mozilla.org/integration/gaia-2_1/rev/f43414d6010b
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1074512 - [TaskManager] Allow search app role in filter

========

https://hg.mozilla.org/integration/gaia-2_1/rev/0915291c8dc3
Author: Ryan VanderMeulen <ryanvm@gmail.com>
Desc: Merge pull request #24747 from gmarty/Bug-1073566-Utility-Tray-Alignment-header-text-v2.1

Bug 1073566 - [Utility Tray] Alignment of header text

========

https://hg.mozilla.org/integration/gaia-2_1/rev/7bf56ad684a9
Author: Guillaume Marty <edo999@gmail.com>
Desc: Bug 1073566 - [Utility Tray] Alignment of header text
Bumping manifests a=b2g-bump
Bug 1068189 - Take into account 'layers.offmainthreadcomposition.testing.enabled' settings when disabling remote tabs. r=billm, a=sledru