commit bf942b7e11df7ef29b64eb8941dc6d08082b89ba
author Jason Monk <jmonk@google.com> Wed Feb 03 18:53:44 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Feb 03 18:53:44 2016 +0000
tree 4e2d8e77a8072b0c60286b6824507f3aec26edb0
parent 4de59d3cdfe375dc3f84a9e83e2130b494682031
parent 8cb4301b59f95bff09526c32b30ecde396e164f7

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

* commit '8cb4301b59f95bff09526c32b30ecde396e164f7':
  Change receiver name attribute for DISCOVERABLE_TIMEOUT

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 3d538a1..35c0f45 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2440,7 +2440,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>