diff options
| author | 2017-03-14 14:01:57 -0700 | |
|---|---|---|
| committer | 2017-03-14 14:01:57 -0700 | |
| commit | ab96721a57637cc9132bddb09f407d2a9976dce8 (patch) | |
| tree | 7d1dd660d537f03b55aa451f77c74a57b1cbfc5f | |
| parent | 5cd3bb93ce6b63dbe9f19d7ad45be2a87904762c (diff) | |
| parent | 4b39c15da0f5d100b9ce6fc29a8f499362c53542 (diff) | |
resolve merge conflicts of 4b39c15da0f5 to nyc-mr2-dev-plus-aosp
Change-Id: I7567db6d1fbb9f8a8b5e29c3e24cdff6508c4b6f
| -rw-r--r-- | core/res/AndroidManifest.xml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 4d2dee5c3287..e81bec9da20d 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -212,6 +212,7 @@ <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" /> |