Bug 1022229 - Borrow App ID and mozBrowser-ness when creating sandbox null principals. r=bz
Bug 1022229 - Tests. r=bz
Bug 1024250; r=bz
Merge fx-team to m-c. a=merge
Merge inbound to m-c on a CLOSED TREE. a=merge
Merge m-c to b2g-inbound on a CLOSED TREE.
Bug 1037212 - [Flame] Phone is not completely erased when a ringtone is set from the Music App r=dougt,dhylands,khuey
Bumping manifests a=b2g-bump
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/67cb3ced85f8
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Merge pull request #21792 from davidflanagan/bug1037097

Bug 1037097: restrict image decode size in MediaFrame based on device memory size

========

https://hg.mozilla.org/integration/gaia-central/rev/1986368a4663
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Bug 1037097: restrict image decode size in MediaFrame based on device memory size

add unit tests
Bumping manifests a=b2g-bump
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/5e7993f00854
Author: George <georgeiscoming@gmail.com>
Desc: Merge pull request #21743 from cctuan/1036788

Bug 1036788 - Stop using origins to identify apps

========

https://hg.mozilla.org/integration/gaia-central/rev/f760fd75ec06
Author: cctuan <georgeiscoming@gmail.com>
Desc: Bug 1036788 - Stop using origins to identify apps
Bumping manifests a=b2g-bump
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/f1e043e26ed2
Author: Rudy Lu <me@rudy.lu>
Desc: Merge pull request #21814 from RudyLu/keyboard/Bug1039163-remove_css_popup_delay

Bug 1039163 - Remove the CSS transition delay for key popup and  highlights.
r=timdream.

========

https://hg.mozilla.org/integration/gaia-central/rev/7f8371220ba3
Author: Rudy Lu <me@rudy.lu>
Desc:  Bug 1039163 - Remove the CSS transition delay for key popup and
 highlights.
Bumping manifests a=b2g-bump
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/2d9efd61d043
Author: Yuren Ju <yurenju@gmail.com>
Desc: Merge pull request #21899 from yurenju/wlach-1039739

Bug 1039739 - Add some logging when writing the git commit id into the s... r=@yurenju

========

https://hg.mozilla.org/integration/gaia-central/rev/cd79430fcc38
Author: William Lachance <wlachance@mozilla.com>
Desc: Bug 1039739 - Add some logging when writing the git commit id into the settings app;r=yurenju
Bumping manifests a=b2g-bump
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/2cd760a699de
Author: Rudy Lu <me@rudy.lu>
Desc: Merge pull request #21807 from RudyLu/keyboard/Bug1038131-remove_selectionchange_listener

Bug 1038131 - latin.js failed to deactivate and continue to respond to
r=timdream.

========

https://hg.mozilla.org/integration/gaia-central/rev/3cb87c1b04da
Author: Rudy Lu <me@rudy.lu>
Desc: Bug 1038131 - latin.js failed to deactivate and continue to respond to
selectionchange.
 - Remove the event listener for 'selectionchange' in IME's deactivate().
Bumping manifests a=b2g-bump
Bumping gaia.json for 4 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/de790a9944e5
Author: Greg Weng <snowmantw@gmail.com>
Desc: Merge pull request #21661 from snowmantw/issue1036236

Bug 1036236 - [LockScreen] Unlock to Camera twice would make it unavaila...

========

https://hg.mozilla.org/integration/gaia-central/rev/96dcf8e001cf
Author: Greg Weng <snowmantw@gmail.com>
Desc: Bug 1036236 - [LockScreen] Unlock to Camera twice would make it unavailable

========

https://hg.mozilla.org/integration/gaia-central/rev/7fc750b6f483
Author: Yuren Ju <yurenju@gmail.com>
Desc: Merge pull request #21855 from yurenju/jsonlint

Bug 1039967 - Add json lint to verify all json files in major directories in gaia r=@cctuan

========

https://hg.mozilla.org/integration/gaia-central/rev/2b6c66187480
Author: Yuren Ju <yurenju@gmail.com>
Desc: Bug 1039967 - Add json lint to verify all json files in major directories in gaia
Bumping manifests a=b2g-bump