commit ebfcadc8b80f7aceeaf108b7208a22859db76975
author Jason Monk <jmonk@google.com> Wed Feb 03 18:55:48 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Feb 03 18:55:48 2016 +0000
tree 7e906587e2cca5bae00d65a996b28e62e07a9134
parent 70e1b41f5a0d18e47daf371b006c11b7d5cb418a
parent bf942b7e11df7ef29b64eb8941dc6d08082b89ba

Merge "Change receiver name attribute for DISCOVERABLE_TIMEOUT" am: 8cb4301b59
am: bf942b7e11

* commit 'bf942b7e11df7ef29b64eb8941dc6d08082b89ba':
  Change receiver name attribute for DISCOVERABLE_TIMEOUT

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index c40328e..ddf551e 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2597,7 +2597,7 @@
             <meta-data android:name="android.appwidget.provider" android:resource="@xml/appwidget_info" />
         </receiver>
 
-        <receiver android:name=".bluetooth.BluetoothDiscoverableTimeoutReceiver">
+        <receiver android:name="com.android.settingslib.bluetooth.BluetoothDiscoverableTimeoutReceiver">
             <intent-filter>
                 <action android:name="android.bluetooth.intent.DISCOVERABLE_TIMEOUT" />
             </intent-filter>