Merge mozilla-central and b2g-inbound

Bumping manifests a=b2g-bump

Bumping gaia.json for 4 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/900704edb7d0 Author: Sergi Mansilla <sergi.mansilla@gmail.com> Desc: Merge pull request #22930 from arcturus/bug-1035760 Bug 1035760 - [B2G][Contacts] support 24 hour time format r=sergi ======== https://hg.mozilla.org/integration/gaia-central/rev/b5e23a70a831 Author: Francisco Jordano <fjordano@mozilla.com> Desc: Bug 1035760 - [B2G][Contacts] support 24 hour time format r=sergi ======== https://hg.mozilla.org/integration/gaia-central/rev/8096d964b805 Author: Francisco Jordano <arcturus@ardeenelinfierno.com> Desc: Merge pull request #21401 from michalbe/Bug1034405 Bug 1034405 - [NFC] Sharing contact imported by NFC ======== https://hg.mozilla.org/integration/gaia-central/rev/e61fb77c239c Author: Michal Budzynski <michal@virtualdesign.pl> Desc: Bug 1034405 - [NFC] :zap: Sharing contact imported by NFC

Bumping manifests a=b2g-bump

Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/13b1c9c39a00 Author: Gabriele Svelto <gsvelto@mozilla.com> Desc: Merge pull request #18380 from kumarrishav/issue-980396 Bug 980396 - Remove navigator.mozMobileConnection uses from the contacts app r=gsvelto ======== https://hg.mozilla.org/integration/gaia-central/rev/2157c684b39f Author: kumarrishav <rishav006@gmail.com> Desc: Bug 980396 - Remove navigator.mozMobileConnection uses from the contacts app

Bumping manifests a=b2g-bump

Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/dba2f08117e2 Author: Ryan VanderMeulen <rvandermeulen@mozilla.com> Desc: Merge pull request #21216 from oklang/master Bug 1030110 - Make the shutdown animation fill the display height ======== https://hg.mozilla.org/integration/gaia-central/rev/98df3839372d Author: Olle Klang <olle.klang@sonymobile.com> Desc: Bug 1030110 - Make the shutdown animation fill the display height Using percentage instead of rem for positioning the rings and vh/vw for sizeing to make them spread out and rezise over any screen size.

Bug 979739 - Fix netmask string format error and use netHelper. r=vchang

Merge latest green b2g-inbound changeset and mozilla-central; a=merge

Bumping manifests a=b2g-bump

Bumping gaia.json for 3 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/0ba05a226993 Author: Ed Morley <emorley@mozilla.com> Desc: Revert "Bug 1048228 - Set the last used keyboard as default after restart of the phone" for failures in keyboard_helper_test.js This reverts commit 1c6d4aae865a8f6786f9924b4a6e85083504be2c. ======== https://hg.mozilla.org/integration/gaia-central/rev/87432f61d05a Author: Cristian Rodriguez <crdlc@tid.es> Desc: Merge pull request #22885 from ADLR-es/fix-bug-1052902 Bug 1052902 - [B2G][Contacts][Facebook] De-syncing Facebook Contacts wil... ======== https://hg.mozilla.org/integration/gaia-central/rev/c1ad1c9f1d33 Author: Adrián de la Rosa <hola@adlr.es> Desc: Bug 1052902 - [B2G][Contacts][Facebook] De-syncing Facebook Contacts will display a wrong message

Bumping manifests a=b2g-bump

Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/1eea30c97d88 Author: Francisco Jordano <arcturus@ardeenelinfierno.com> Desc: Merge pull request #22932 from arcturus/bug-1048160 Bug 1048160 - [Contacts Actionable Fields] Remove undo functionality r=sergi ======== https://hg.mozilla.org/integration/gaia-central/rev/c324194fedbd Author: Francisco Jordano <fjordano@mozilla.com> Desc: Bug 1048160 - [Contacts Actionable Fields] Remove undo functionality r=sergi

Bug 1054217 - Part 4: Refine Nfc.receiveMessage. r=dimi From 68d1ccd5d2e0e0f85803e56741ae17ff89c4a2a7 Mon Sep 17 00:00:00 2001 --- dom/nfc/gonk/Nfc.js | 61 ++++++++++++++++++++++++----------------------------- 1 file changed, 28 insertions(+), 33 deletions(-)

Bug 1054217 - part 3: rename setSessionToken to checkSessionToken. r=dimi

Bug 1054217 - part 2: remove targetsBySessionTokens. r=dimi From 07ca796ae9e1d8f98d8282c2bc4f68046d311fde Mon Sep 17 00:00:00 2001 --- dom/nfc/gonk/Nfc.js | 124 ++++++++++----------------------------------- dom/nfc/gonk/nfc_consts.js | 2 + 2 files changed, 29 insertions(+), 97 deletions(-)

Bug 1054217 - Part 1: Add onPeerLost in gMessageManager. r=dimi From 1e81ab61d3ff409817415b5e8b610f77461836f8 Mon Sep 17 00:00:00 2001 --- dom/nfc/gonk/Nfc.js | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-)

Bumping manifests a=b2g-bump

Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/03d3c709023b Author: Jan Jongboom <janjongboom@gmail.com> Desc: Merge pull request #22838 from comoyo/bug1048228 Bug 1048228 - Set the last used keyboard as default after restart of the phone. r=timdream ======== https://hg.mozilla.org/integration/gaia-central/rev/248c2ea59432 Author: Jan Jongboom <janjongboom@gmail.com> Desc: Bug 1048228 - Set the last used keyboard as default after restart of the phone

Bumping manifests a=b2g-bump