Merge pull request #28134 from ian-liu/settings/bluetooth/bug1121904_…

…implement_connect/disconnect_dialog_for_a_paired_device/headset_for_v2 Bug 1121904 - [Bluetooth][Settings] Show connect/disconnect/unpair dialog for a paired device/headset. r=arthur
mozilla-b2g · Mar 11, 2015 · 4d83e5f · 4d83e5f
2 parents 5844bf6 + 50a3612
commit 4d83e5f
Show file tree

Hide file tree

Showing 17 changed files with 4,615 additions and 123 deletions.
diff --git a/apps/bluetooth/js/config/require.js b/apps/bluetooth/js/config/require.js
@@ -6,6 +6,9 @@ require.config({
     'shared': '../shared/js'
   },
   shim: {
+    'shared/async_storage': {
+      exports: 'asyncStorage'
+    },
     'shared/bluetooth_helper': {
       exports: 'BluetoothHelper'
     }