From 7c83aef755244bc428ee51379db3753b502f16d6 Mon Sep 17 00:00:00 2001
From: William Escande <wescande@google.com>
Date: Tue, 1 Feb 2022 19:42:24 +0100
Subject: [PATCH] Missing line that generate merge conflict

Test: not needed at all
Change-Id: Id7fec98705fd82b7ecc8060432f4b9d1cbecdca7
---
 media/java/android/media/BtProfileConnectionInfo.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/media/java/android/media/BtProfileConnectionInfo.java b/media/java/android/media/BtProfileConnectionInfo.java
index 86dc6e0f09c54..88b9777e911dc 100644
--- 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;