Merge branch 'qa_1.1.5_1' into dev

# Conflicts: # .idea/codeStyles/Project.xml
2020-08-31 17:41:22 +08:00
parent 937dfbbd16 0a1cc39b23
commit 72dda574d4
9 changed files with 35 additions and 20 deletions
--- a/app/src/e8xx/AndroidManifest.xml
+++ b/app/src/e8xx/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:tools="http://schemas.android.com/tools"
-    android:sharedUserId="android.uid.system"
    package="com.mogo.launcher">
 </manifest>