Merge branch 'react-native-video/master' into feature/android-pip
# Conflicts: # CHANGELOG.md # android-exoplayer/build.gradle # android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java # package.json
Loading
Please sign in to comment