Remove release notes lines added by merge conflict

#minor-release

PiperOrigin-RevId: 571005643
(cherry picked from commit 49b1e0bbc2a82f3b9c6ba0a1696ee0b1e53673ec)
This commit is contained in:
tonihei 2023-10-05 07:06:28 -07:00 committed by oceanjules
parent dad362b414
commit 03008b966d

View File

@ -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)).