Merge branch 'master' of ssh://192.168.1.116:29418/bolan-root/frontend/manager-app-sz into wq

android/app/build.gradle

@@ -116,14 +116,6 @@ android {
             abiFilters "armeabi-v7a", "x86"
         }
     }
-    productFlavors {
-        dev {
-            minSdkVersion 21
-        }
-        prod {
-            minSdkVersion 16
-        }
-    }
     dexOptions {
         javaMaxHeapSize "2G"
     }