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

2021-02-01 08:19:47 +00:00
parent 44b9940c4a 7cd99c47bb
commit 9dd3a7b6a0
1 changed files with 1 additions and 1 deletions
--- a/core/java/android/bluetooth/BluetoothHeadset.java
+++ b/core/java/android/bluetooth/BluetoothHeadset.java
@@ -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>