Merge mozilla-central and birch

b2g/config/gaia.json

@@ -1,4 +1,4 @@
 {
-    "revision": "d717e2e751a6bb1303499bde6be9dbd88b275e30", 
+    "revision": "a9de5769866dcabd8205fcd5008cac4a52de687d", 
     "repo_path": "/integration/gaia-central"
 }

dom/messages/SystemMessagePermissionsChecker.jsm

@@ -34,15 +34,6 @@ this.SystemMessagePermissionsTable = {
   "bluetooth-dialer-command": {
     "telephony": []
   },
-  "bluetooth-requestconfirmation": {
-    "bluetooth": []
-  },
-  "bluetooth-requestpasskey": {
-    "bluetooth": []
-  },
-  "bluetooth-requestpincode": {
-    "bluetooth": []
-  },
   "bluetooth-authorize": {
     "bluetooth": []
   },
@@ -52,6 +43,9 @@ this.SystemMessagePermissionsTable = {
   "bluetooth-pairedstatuschanged": {
     "bluetooth": []
   },
+  "bluetooth-a2dp-status-changed": {
+    "bluetooth": []
+  },
   "bluetooth-hfp-status-changed": {
     "bluetooth": []
   },