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/2f94c68612bf
Author: Bob Silverberg <bob.silverberg@gmail.com>
Desc: Merge pull request #14312 from AlinT/bug_938203_1_2

Bug 938208 - Write test to enable Power Save mode

========

https://hg.mozilla.org/integration/gaia-1_2/rev/401486169080
Author: Teodosia Pop <teodosia.pop@gmail.com>
Desc: Bug 938208 - Write test to enable Power Save mode
Bumping gaia.json for 1 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/5179d960b469
Author: Julien Wajsberg <felash@gmail.com>
Desc: Bug 943183 - [Messages] the bad recipient markers should not be absolutely positioned to a non-scrolled ancestor r=schung

* Add "position: relative" for the absolutely positioned marker's nearest
  ancestor.
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/073ac4ed9b6d
Author: Bob Silverberg <bob.silverberg@gmail.com>
Desc: Merge pull request #14210 from AlinT/bug_943337_v1.2

Bug 943337 - Merge all 2 kill cards view tests into one.

========

https://hg.mozilla.org/integration/gaia-1_2/rev/33db77b11c93
Author: AlinT <trifandreialin@gmail.com>
Desc: Bug 943337 - Merge all 2 kill cards view tests into one.
Bumping gaia.json for 1 gaia-1_2 revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-1_2/rev/3f92117abbe5
Author: Dominic Kuo <dkuo@mozilla.com>
Desc: Merge pull request #14251 from dominickuo/bug-943797

Bug 943797 - [music] Use hash to decide the default album art, r=jimporter(cherry picked from commit e01827ec7b9bc0426e0f5d216123b9247413db4e)
Bug 943752 - Refine BluetoothProfileController logic for AVRCP and HID. r=echou, a=koi+
Bug 941789 - Protect binderDied() by mutex. r=doublec, a=koi+
Bug 944420 - Create TextureHostOGL when Compositor is not present on gonk. r=nical, a=koi+
Bug 933483 - Don't fire events (and especially request animation frame events) when we're in a modal dialog. r=smaug, a=koi+
Bug 946541 - Fix Skia cache purging. r=gw280, a=koi+
Bug 934563 - Use the safe JSContext since it will always exist. r=bholley, a=koi+
Backed out changeset bb96292c9653 (bug 933483) for bustage. a=backout
Bumping gaia.json for 2 gaia-1_2 revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-1_2/rev/59d30d2a6556
Author: gitmai <mri@tid.es>
Desc: Merge pull request #14390 from gitmai/bug-944718-Broken-usage-widget_v1.2

Bug 944718 - [Cost Control] Broken access to usage widget from utility t...
r=jmcf

========

https://hg.mozilla.org/integration/gaia-1_2/rev/39091e360d48
Author: mai <mri@tid.es>
Desc: Bug 944718 - [Cost Control] Broken access to usage widget from utility tray
Bug 946351 - Update to NSS 3.15.3.1 (NSS_3_15_3_1_RTM). r=me, a=koi+

--HG--
extra : rebase_source : 0bcea40dddc7aa5dd96564b8222dea639d78bbe2
Bumping gaia.json for 1 gaia-1_2 revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-1_2/rev/8f6f360a92e8
Author: Arthur Chen <crh0716@gmail.com>
Desc: Merge pull request #13939 from flodolo/bug941901

Bug 941901 - [settings] Use correct entity name for Cell broadcast r=crh0716(cherry picked from commit e42fdf6a6b77038b0a2cd46b9193378d84794c20)

Conflicts:
	apps/settings/elements/messaging.html
Bug 940045 - s/foreach/forEach. a=bustage
Merge b2g26 to v1.2f. a=merge