Merge "Fix wrong TetherProvisioningActivity definition" am: f1e3e9d627

am: 2ee5beaa32

Change-Id: Ifeb4b845b1842cff2096ec20bdd71e7ed4ea93be
This commit is contained in:
markchien
2019-02-13 22:39:00 -08:00
committed by android-build-merger

View File

@@ -436,7 +436,7 @@
android:exported="true" android:exported="true"
android:permission="android.permission.TETHER_PRIVILEGED" /> android:permission="android.permission.TETHER_PRIVILEGED" />
<activity android:name="network.TetherProvisioningActivity" <activity android:name=".network.TetherProvisioningActivity"
android:exported="true" android:exported="true"
android:permission="android.permission.TETHER_PRIVILEGED" android:permission="android.permission.TETHER_PRIVILEGED"
android:excludeFromRecents="true" android:excludeFromRecents="true"