Fix RELEASENOTES merge conflict

ychaparov · copybara-github · commit 7d4f623b0073 · 2024-07-09T02:43:03.000-07:00
PiperOrigin-RevId: 650551156
diff --git 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:
