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

Test: I solemnly swear I tested this conflict resolution. Bug: None Change-Id: I6cbbb7e2c680996bdd7b7f1d84bc14011451c7a5
2021-01-31 00:40:24 +01:00
parent 278b741e3a 132a502721
commit 7cd99c47bb
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>