Gerardo Pacheco 5435e5d545 Merge branch 'master' of https://github.com/react-native-community/react-native-video ... # Conflicts: # android/src/main/java/com/brentvatne/react/ReactVideoView.java		2018-07-25 09:58:46 +02:00
..
src/main	Merge branch 'master' of https://github.com/react-native-community/react-native-video	2018-07-25 09:58:46 +02:00
build.gradle	little improvement over too many "def"	2018-07-24 17:36:24 +03:00