Merge branch 'refs/heads/master' into v681小游戏
# Conflicts: # live/src/main/java/com/yunbao/live/activity/SystemMessageActivity.java # main/src/main/java/com/yunbao/main/activity/MainActivity.java
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:tools="http://schemas.android.com/tools">
|
||||
<uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
|
||||
|
||||
<uses-permission
|
||||
android:name="android.permission.CALL_PHONE"
|
||||
|
||||
Reference in New Issue
Block a user