Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d7f32dc5 authored by Jakub Pawlowski's avatar Jakub Pawlowski Committed by Automerger Merge Worker
Browse files

Merge "resolve merge conflicts of 132a5027 to... 

Merge "resolve merge conflicts of 132a5027 to rvc-qpr-dev-plus-aosp" into rvc-qpr-dev-plus-aosp am: 9dd3a7b6

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13431733

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ieaacca13ba75a2507c7f02ef4e988cd33703c1e1
parents 0074c31d 9dd3a7b6

core/java/android/bluetooth/BluetoothHeadset.java

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ public final class BluetoothHeadset implements BluetoothProfile { 


    /**

     * Intent used to broadcast the change in the Audio Connection state of the

     * HDP profile.

     * HFP profile.

     *

     * <p>This intent will have 3 extras:

     * <ul>