Merge branch 'master' into fix/gradle3

2018-10-13 19:18:13 -07:00
parent 00174b63b8 604250b4a6
commit 051a2c39f4
28 changed files with 1063 additions and 340 deletions
--- a/android/src/main/java/com/brentvatne/react/ReactVideoView.java
+++ b/android/src/main/java/com/brentvatne/react/ReactVideoView.java
@@ -1,6 +1,7 @@
 package com.brentvatne.react;

 import android.annotation.SuppressLint;
+import android.annotation.TargetApi;
 import android.app.Activity;
 import android.content.res.AssetFileDescriptor;
 import android.graphics.Matrix;