commit 8cb4301b59f95bff09526c32b30ecde396e164f7
author Jason Monk <jmonk@google.com> Wed Feb 03 18:48:27 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Feb 03 18:48:27 2016 +0000
tree 73d5a39b843b0ad3e5ac4afec1cd66363f8a90cc
parent 86467366183e7b7ca006456474cca50332213ca5
parent 70b1928a5aa1d1f519d8b856ea6aff045f3e10e3

Merge "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>