summaryrefslogtreecommitdiffstats
path: root/src/com/android/packageinstaller/permission/ui/ManagePermissionsActivity.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/com/android/packageinstaller/permission/ui/ManagePermissionsActivity.java')
-rw-r--r--src/com/android/packageinstaller/permission/ui/ManagePermissionsActivity.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/packageinstaller/permission/ui/ManagePermissionsActivity.java b/src/com/android/packageinstaller/permission/ui/ManagePermissionsActivity.java
index 419dbf42..a92b0ea4 100644
--- a/src/com/android/packageinstaller/permission/ui/ManagePermissionsActivity.java
+++ b/src/com/android/packageinstaller/permission/ui/ManagePermissionsActivity.java
@@ -21,9 +21,12 @@ import android.content.Intent;
import android.os.Bundle;
import android.util.Log;
import com.android.packageinstaller.permission.utils.Utils;
+<<<<<<< HEAD
import com.android.packageinstaller.permission.ui.wear.AppPermissionsFragmentWear;
import com.android.packageinstaller.DeviceUtils;
+=======
+>>>>>>> c10abb25f3864e56b2a24ef3661511cd78921225
public final class ManagePermissionsActivity extends OverlayTouchActivity {
private static final String LOG_TAG = "ManagePermissionsActivity";