Bumping gaia.json for 2 gaia-central revision(s)

========

https://hg.mozilla.org/integration/gaia-central/rev/01fcb484d4bd
Author: ochameau <poirot.alex@gmail.com>
Desc: Merge pull request #10535 from AntonioMA/master

Bug 885682: Allow including preference files from GAIA_DISTRIBUTION_DIR r=ochameau

========

https://hg.mozilla.org/integration/gaia-central/rev/1cd42ff41b69
Author: Antonio M. Amaya <amac@peregrin>
Desc: Modified Makefile to include partner-prefs.js file from GAIA_DISTRIBUTION_DIR if it exists
Bumping gaia.json for 4 gaia-central revision(s)
Truncated some number of revisions since the previous bump.

========

https://hg.mozilla.org/integration/gaia-central/rev/3b11c4cca57e
Author: Cristian Rodriguez <crdlc@tid.es>
Desc: Merge pull request #10534 from crdlc/bug-885625

Bug 885625 - homescreen icons overlap after dragging an icon from one pa...

========

https://hg.mozilla.org/integration/gaia-central/rev/d2c45d35fc0a
Author: crdlc <crdlc@tid.es>
Desc: Bug 885625 - homescreen icons overlap after dragging an icon from one page to another

========

https://hg.mozilla.org/integration/gaia-central/rev/4ea93660241c
Author: Ian Liu <iliu@mozilla.com>
Desc: Merge pull request #10564 from ian-liu/bluetooth/Bug883737_screen_layout_size_is_exceeded_in_pop_up_dialog

Bug 883737 - [Bluetooth][File-Transfer] screen layout size is exceeded in Bluetooth Transfer pop-up screen, r=@alivedise

========

https://hg.mozilla.org/integration/gaia-central/rev/f8436be99004
Author: ian-liu <iliu@mozilla.com>
Desc: Bug 883737 - [Bluetooth][File-Transfer] screen layout size is exceeded in Bluetooth Transfer pop-up screen
Bug 885652 - B2G SMS: DOMRequest in sending SMS API does not trigger onsuccess or onerror function when the SIM card is not installed or radio is disabled. r=vicamo a=leo+
Bug 885674 - Alarm API - Delete Alarm API data on app uninstallation (and clear data?) (follow-up). r=nsm
Bug 876614 - Queue up the incomming message if we're currently dispatching a message to avoid nested event loop (e.g. via alert()). r=jlebar a=leo+
Merge mozilla-central and birch
Bumping gaia.json for 2 gaia-central revision(s)
Truncated some number of revisions since the previous bump.

========

https://hg.mozilla.org/integration/gaia-central/rev/15b25eafc10d
Author: Fabien Cazenave <fabien@cazenave.cc>
Desc: Merge pull request #10537 from fabi1cazenave/obsoleteDialerStrings-bug885700

Bug 885700 - Remove obsolete strings from the Dialer locale

========

https://hg.mozilla.org/integration/gaia-central/rev/f2ea3dc6da6a
Author: Fabien Cazenave <fabien@cazenave.cc>
Desc: Bug 885700 - Remove obsolete strings from the Dialer locale
Bug 786700 - Wifi: Add the ability to set a static IP instead of using DHCP. r=vchang, r=mrbkap
Bug 868941 - Connecting to WLAN using WPA-EAP with special options (mschapv2/PEAP) is not possible. r=vchang
Bug 880735 part A - Add a .defaultFallbackType to plugins so that we can avoid re-implementing the ShouldPlay logic in the frontend code. r=johns
Bug 880735 part B - add .getPluginTagForType and make .getBlocklistStateForType scriptable, r=johns
Bug 880735 part C - Disabled plugins should be always disabled, site-specific permissions do not override them. I'm sorry for the churn from bug 875454. At least the logic is in one place and easy to fix! r=johns
Bug 883420 - Add an API to set a new expireTime for an existing permission, r=ehsan sr=mounir
Bug 880735 part E - Use the new permissionmanager.updateExpireTime method to make sure that plugin permissions are renewed properly, r=johns
Bug 880735 part D - New doorhanger frontend code. Removes all logic which shows the plugin doorhanger automatically, including on scripting. Always show the doorhanger when there is a plugin present on the page, even if that plugin is currently enabled. Make the "always" choices clear to the user. r=jaws
Bug 880735 part F - Remove extra functions, strings, and styles which are no longer needed, r=jaws
Bug 880735 test fixups:
* Add a test-only setter to the center-item XBL binding
* add a head.js function to remove plugin permissions for use in cleanup functions
* browser_pluginnotification.js - lots of fixes for the core feature tests
* Alter test_bug751809 not to assume that clicking the page overlay will directly activate the plugin
* Alter browser_CTP_plugins.js because disabled plugins now do show up in the plugin doorhanger
* remove browser_CTPScriptPlugin.js and supporting files because we no longer auto-pop based on scripting
* fix browser_CTP_drag_drop.js so that active plugins still show the doorhanger icon, and other fixup
* fix browser_bug743421.js to expect the doorhanger all the time and activate it correctly
* fix browser_bug752516.js to check for doorhanger activation instead of plugin activation
* remove browser_bug818009.js and supporting files because they are testing something that no longer exists
* alter browser_bug820497.js so that it shows the popup notification before checking .centerActions, since we populate that data lazily now
* browser_plugins_added_dynamically.js: remove the "activate all" tests which are no longer relevant and fix the rest to match the new doorhanger structure.
Bug 880735 part S - Basic styling so that this can land - add classes to the binding for styling hooks and fix space handling. Make the buttons fill the space, limit the doorhanger size, and add whitespace/separators for the multi-plugin UI, r=jaws
Bug 880735 part D followup: flod pointed out that I changed these strings without changing the key, and since changing the key is hard I'm just going to revert them for now and do something better in a followup.
Bug 880735 part S followup review comment - put the plugin doorhanger styles into shared/