olivier bouillet 2b6654b458 Merge branch 'master' of https://github.com/react-native-video/react-native-video into feat/add_new_events_on_tracks_changed ... # Conflicts: # API.md # android/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java # android/src/main/java/com/brentvatne/exoplayer/VideoEventEmitter.java # examples/basic/yarn.lock		2023-01-02 22:59:10 +01:00
..
brentvatne	Merge branch 'master' of https://github.com/react-native-video/react-native-video into feat/add_new_events_on_tracks_changed	2023-01-02 22:59:10 +01:00