commit 4034a9a96a58e37d1a0bebb7c4b9005b2af72cfe
author Marie Janssen <jamuraa@google.com> Tue Mar 14 10:09:52 2017 -0700
committer Marie Janssen <jamuraa@google.com> Tue Mar 14 10:09:52 2017 -0700
tree c47eb6300833829892ff4a923684cec2adeb5ddf
parent c5d86736d36ec429409e84454436ddef870c25b2
parent faf40708836c34936932c67f47ed39ef4b85de03

Merge commit 'faf40708836c34936932c67f47ed39ef4b85de03' into manual_merge_faf40708836c

Change-Id: I2b9aeca138aefb0579b3be8014b3f0bf49d99764

core/res/AndroidManifest.xml

diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 6a81405..a62e5f7 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -194,6 +194,8 @@
     <protected-broadcast android:name="android.btopp.intent.action.OPEN" />
     <protected-broadcast android:name="android.btopp.intent.action.OPEN_INBOUND" />
     <protected-broadcast android:name="android.btopp.intent.action.TRANSFER_COMPLETE" />
+    <protected-broadcast android:name="android.btopp.intent.action.ACCEPT" />
+    <protected-broadcast android:name="android.btopp.intent.action.DECLINE" />
     <protected-broadcast android:name="com.android.bluetooth.gatt.REFRESH_BATCHED_SCAN" />
     <protected-broadcast android:name="com.android.bluetooth.pbap.authchall" />
     <protected-broadcast android:name="com.android.bluetooth.pbap.userconfirmtimeout" />