Merge branch 'master' of https://github.com/ValuesFeng/ResoCamera

Author: ValuesFeng

example/src/main/AndroidManifest.xml

@@ -12,7 +12,6 @@
 
     <application
         android:allowBackup="true"
-        android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
         android:theme="@android:style/Theme.Black.NoTitleBar.Fullscreen">
         <activity