From 7d4f623b00734b3825287c097c4b10d2af62c171 Mon Sep 17 00:00:00 2001
From: dancho <dancho@google.com>
Date: Tue, 9 Jul 2024 02:40:21 -0700
Subject: [PATCH] Fix RELEASENOTES merge conflict

PiperOrigin-RevId: 650551156
---
 RELEASENOTES.md | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index e7fd359e7f..3a22248fff 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -24,12 +24,6 @@
         Transformer via a `Surface`.
 *   Track Selection:
 *   Extractors:
-    *   Allow `Mp4Extractor` to identify H264 samples that are not used as
-        reference by subsequent samples.
-*   DataSource:
-    *   Update `HttpEngineDataSource` to allow use starting at version S
-        extension 7 instead of API level 34
-        ([#1262](https://github.com/androidx/media/issues/1262)).
     *   Allow `Mp4Extractor` and `FragmentedMp4Extractor` to identify H264
         samples that are not used as reference by subsequent samples.
 *   Audio: