merge mozilla-central to b2g-inbound

Bumping gaia.json for 1 gaia-central revision(s) ======== https://hg.mozilla.org/integration/gaia-central/rev/cf4b9e1d77d1 Author: Julien Wajsberg <felash@gmail.com> Desc: Bug 902390 - [sms][mms] the input is 1px too high with the 'Moz' font r=borja

Bumping gaia.json for 4 gaia-central revision(s) ======== https://hg.mozilla.org/integration/gaia-central/rev/80cde7ce278e Author: Jose M. Cantera <jmcanterafonseca@gmail.com> Desc: Merge pull request #11378 from jmcanterafonseca/align_fb_active_merge Bug 901571 - FB Contacts must not match under different circumstances ======== https://hg.mozilla.org/integration/gaia-central/rev/f11cf9fe096d Author: Jose M. Cantera <jmcanterafonseca@gmail.com> Desc: Bug 901571 - FB Contacts must not match under different circumstances ======== https://hg.mozilla.org/integration/gaia-central/rev/45321dab19db Author: Jose M. Cantera <jmcanterafonseca@gmail.com> Desc: Merge pull request #11419 from jmcanterafonseca/edit_active_merge Bug 902391 - Active merge in edit mode for Contacts ======== https://hg.mozilla.org/integration/gaia-central/rev/316758208a3c Author: Jose M. Cantera <jmcanterafonseca@gmail.com> Desc: Bug 902391 - Active merge in edit mode for Contacts

Bumping gaia.json for 4 gaia-central revision(s) ======== https://hg.mozilla.org/integration/gaia-central/rev/dbfb03ac7296 Author: Etienne Segonzac <etienne@segonzac.info> Desc: Merge pull request #10865 from lissyx/bug889245 Bug 889245 - [Call log] When user make a voicemail call, call log shows ... ======== https://hg.mozilla.org/integration/gaia-central/rev/89fb5a99c545 Author: Alexandre Lissy <lissyx+mozillians@lissyx.dyndns.org> Desc: Bug 889245 - [Call log] Display emergency number or Voicemail string ======== https://hg.mozilla.org/integration/gaia-central/rev/a212e78a202b Author: Arthur Chen <crh0716@gmail.com> Desc: Merge pull request #11333 from crh0716/900386 Bug 900386 - Use localize function to do localization r=evelyn ======== https://hg.mozilla.org/integration/gaia-central/rev/e6fa4ecb565c Author: crh0716 <crh0716@gmail.com> Desc: Bug 900386 - Use localize function to do localization

Bumping gaia.json for 2 gaia-central revision(s) ======== https://hg.mozilla.org/integration/gaia-central/rev/20258a9a0b11 Author: Etienne Segonzac <etienne@segonzac.info> Desc: Merge pull request #10929 from lissyx/bug892520 Bug 892520 - Ensure serialization of upgrade path ======== https://hg.mozilla.org/integration/gaia-central/rev/bc8ab7a1d3bd Author: Alexandre Lissy <lissyx+github@lissyx.dyndns.org> Desc: Bug 892520 - Ensure proper upgrade path

Bug 891257 - Disconnect gracefully when the user turns off Bluetooth, r=mrbkap

Bug 902480 - B2G RIL: follow up to bug 743150 - this._sendTelephonyMessage is not a function. r=allstars.chh

Bumping gaia.json for 2 gaia-central revision(s) ======== https://hg.mozilla.org/integration/gaia-central/rev/1d71d406d7fe Author: George <georgeiscoming@gmail.com> Desc: Merge pull request #11380 from cctuan/896934 Bug 896934 - [Settings] Listen new system message for Bluetooth pairing requests in connectivity.js ======== https://hg.mozilla.org/integration/gaia-central/rev/2a769b49413e Author: cctuan <georgeiscoming@gmail.com> Desc: Bug 896934 - [Settings] Listen new system message for Bluetooth pairing requests in connectivity.js

Bug 831224: Added mochitest for variable-bitrate MP3s, r=padenot The test checks the duration of an MP3 file with variable bitrate. The MP3 file only contains silence. It uses a high bit-rate encoding for its first half, a low bit-rate encoding for its second half. The correct duration is 10 seconds, but an incorrect implementation will return a much shorter value.

Bug 831224: Use multi-threaded I/O for reading and processing MP3 frames, r=padenot Reading large MP3 files from a slow medium, such as an SD card, takes several seconds. This is too long for interactive applications like the music app. With this patch, the OmxDecoder reads large MP3 file in smaller chunks and hands over each chunk individually to the MP3 parser. Reading the file is done in the I/O thread, which is allowed to block, parsing is done on the main thread. The current chunk size is 8 MiB, which is small enough to not cause any delay.

Bug 831224: Parse MP3 frame headers in OmxDecoder, r=padenot On FirefoxOS, the Android libraries estimate the duration of MP3 streams by examining the first MP3 frame header. This only works for streams with constant bit rate. For streams with variable bit rate, a too short or too long duration is computed. This patch adds support for parsing MP3 frame headers. The decoder handles file streams by reading them at once at the beginning and parsing them immediately. Network streams are updated when a new fragment arrives.

Bug 831224: Allow update of the media duration, r=padenot With MP3 streams, the media duration might change after we received new data. This patch adds infrastructure to signal the new duration to the media decoder and state machine. It will also fire an event of type 'durationchange' to the DOM.

Bug 831224: Added MP3 frame parser, r=padenot MP3 streams consist of small frames, with each frame containing the audio data of a few hundred milliseconds. The actual duration of the encoded audio can among frames. Each frame consists of a 4-byte frame header, some optional extra information, and the audio data. The MP3 frame parser walks over the content of an MP3 stream, computes the duration of each frame from the frame header, and sums them up to the streams complete duration. The MP3 frame parser does not decode the actual audio data.

Bug 831224: Remove trailing whitespaces, r=padenot

Bumping gaia.json for 2 gaia-central revision(s) ======== https://hg.mozilla.org/integration/gaia-central/rev/5eaec29efe38 Author: Arthur Chen <crh0716@gmail.com> Desc: Merge pull request #11393 from chuck-lee/bug-901837_WAP_Push_test_app Bug 901837 - Test app for receiving WAP Push. r=arthurcc ======== https://hg.mozilla.org/integration/gaia-central/rev/0a2692200e33 Author: Chuck Lee <chulee@mozilla.com> Desc: Bug 901837 - Test app for receiving WAP Push.

Merge m-c to fx-team

Bug 900289: Enable foreign key pragma on FHR database. r=rnewman

Backed out changeset 1230bd543454 (bug 792806)

Backed out changeset 24e725b72a0d (bug 792806)

Bug 880101 - part 2 - Wait until the initial tab's content document has been created before adding the progress listener; r=gavin