diff options
| author | Svetoslav <svetoslavganov@google.com> | 2015-11-20 15:03:48 -0800 |
|---|---|---|
| committer | Svetoslav <svetoslavganov@google.com> | 2015-11-20 15:03:48 -0800 |
| commit | c3d14f58d80cc5ed8b60ee1782d38643c08734e7 (patch) | |
| tree | 24dd2d2db0d8196ceacc681d9a896011cb8e84f9 /src/com/android/packageinstaller/permission/ui/ManagePermissionsActivity.java | |
| parent | ef861375eebd9ac6cce7c0bb163380ab1c951063 (diff) | |
| parent | c10abb25f3864e56b2a24ef3661511cd78921225 (diff) | |
| download | android_packages_apps_PackageInstaller-c3d14f58d80cc5ed8b60ee1782d38643c08734e7.tar.gz android_packages_apps_PackageInstaller-c3d14f58d80cc5ed8b60ee1782d38643c08734e7.tar.bz2 android_packages_apps_PackageInstaller-c3d14f58d80cc5ed8b60ee1782d38643c08734e7.zip | |
resolve merge conflicts of c10abb25f3 to cw-e-dev.
Change-Id: I965fb579e2730fa1cdb182bc18e134f262929328
Diffstat (limited to 'src/com/android/packageinstaller/permission/ui/ManagePermissionsActivity.java')
| -rw-r--r-- | src/com/android/packageinstaller/permission/ui/ManagePermissionsActivity.java | 3 |
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"; |