Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie0454f3a507f867ccbc9fa4c197991713bdddd63
This commit is contained in:
Jakub Pawlowski
2021-02-01 09:33:18 +00:00
committed by Automerger Merge Worker
parent 993f085d31 d7f32dc5d9
commit 64e169af00
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/bluetooth/BluetoothHeadset.java
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>