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

This commit is contained in:
Jakub Pawlowski
2021-02-01 08:19:47 +00:00
committed by Android (Google) Code Review

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 * Intent used to broadcast the change in the Audio Connection state of the
* HDP profile. * HFP profile.
* *
* <p>This intent will have 3 extras: * <p>This intent will have 3 extras:
* <ul> * <ul>