Merge remote-tracking branch 'origin/master'

FaceUnity/build.gradle

@@ -33,7 +33,7 @@ android {
         versionName rootProject.ext.android.versionName
         manifestPlaceholders = rootProject.ext.manifestPlaceholders
         ndk {
-            abiFilters "armeabi-v7a","arm64-v8a"
+            abiFilters "armeabi-v7a", "arm64-v8a"
         }
     }
     aaptOptions {
@@ -54,7 +54,7 @@ android {
 }
 repositories {
     flatDir {
-        dirs 'libs','../libs'
+        dirs 'libs', '../libs'
     }
 }
 dependencies {

FaceUnity/src/main/AndroidManifest.xml

@@ -10,6 +10,7 @@
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
 
     <application
+        android:icon="@mipmap/ico_home_animoji"
         android:allowBackup="true">
 
     </application>