Missing line that generate merge conflict

Test: not needed at all Change-Id: Id7fec98705fd82b7ecc8060432f4b9d1cbecdca7
2022-02-01 19:42:24 +01:00
parent 4908115674
commit 7c83aef755
1 changed files with 1 additions and 0 deletions
--- a/media/java/android/media/BtProfileConnectionInfo.java
+++ b/media/java/android/media/BtProfileConnectionInfo.java
@@ -27,6 +27,7 @@ import android.os.Parcelable;
 */
@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
 public final class BtProfileConnectionInfo implements Parcelable {
+
    private final int mProfile;
    private final boolean mSupprNoisy;
    private final int mVolume;