From 03008b966d4acb92530e58ba4c4ea32f936b566a Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Thu, 5 Oct 2023 07:06:28 -0700
Subject: [PATCH] Remove release notes lines added by merge conflict

#minor-release

PiperOrigin-RevId: 571005643
(cherry picked from commit 49b1e0bbc2a82f3b9c6ba0a1696ee0b1e53673ec)
---
 RELEASENOTES.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 51e6bd1913..e7078c08eb 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -141,8 +141,6 @@ This release includes the following changes since the
         ([#577](https://github.com/androidx/media/issues/577)).
     *   Ignore custom Rtsp request methods in Options response public header
         ([#613](https://github.com/androidx/media/issues/613)).
-*   Decoder Extensions (FFmpeg, VP9, AV1, etc.):
-*   MIDI extension:
 *   Leanback extension:
     *   Fix bug where disabling a surface can cause an `ArithmeticException` in
         Leanback code ([#617](https://github.com/androidx/media/issues/617)).