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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ieaacca13ba75a2507c7f02ef4e988cd33703c1e1
This commit is contained in:
Jakub Pawlowski
2021-02-01 09:18:21 +00:00
committed by Automerger Merge Worker

View File

@@ -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>