Merge "Missing line that generate merge conflict" (bcdc7816) · Commits · e / os / android_frameworks_base

media/java/android/media/BtProfileConnectionInfo.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -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;