Merge remote-tracking branch 'origin/maanshan' into maanshan

rk

4 天以前 28d2b0a2b33c786670f4999e4b634036de2d6883

 keyCabinet-android/app/src/main/AndroidManifest.xml

@@ -65,7 +65,6 @@
            android:launchMode="singleTask">
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />

                <category android:name="android.intent.category.LAUNCHER" />
            </intent-filter>
        </activity>