summaryrefslogtreecommitdiffstats
path: root/AndroidManifest.xml
diff options
context:
space:
mode:
authorWalter Jang <wjang@google.com>2016-02-22 21:23:56 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-02-22 21:23:57 +0000
commit4b5b8081c8b46412133e6b971f1d830ab3e9ee38 (patch)
tree464339860af3163df1a9663fc623e075613cc5b9 /AndroidManifest.xml
parentd257289455273fa8390cb9d1e4a03fd1a47e2f02 (diff)
parentd6bcb6f8724ba88ee99f6088098b0ce6455d1f93 (diff)
downloadpackages_apps_Contacts-4b5b8081c8b46412133e6b971f1d830ab3e9ee38.tar.gz
packages_apps_Contacts-4b5b8081c8b46412133e6b971f1d830ab3e9ee38.tar.bz2
packages_apps_Contacts-4b5b8081c8b46412133e6b971f1d830ab3e9ee38.zip
Merge "Revert "Ask for optional permissions when QuickContact opens"" into nyc-dev
Diffstat (limited to 'AndroidManifest.xml')
-rw-r--r--AndroidManifest.xml6
1 files changed, 0 insertions, 6 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index a2eb1a31a..f415d88e7 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -233,12 +233,6 @@
android:exported="false"/>
<activity
- android:name=".common.activity.RequestDesiredPermissionsActivity"
- android:label="@string/launcherActivityLabel"
- android:theme="@style/PeopleTheme"
- android:exported="false"/>
-
- <activity
android:name=".common.activity.RequestImportVCardPermissionsActivity"
android:label="@string/launcherActivityLabel"
android:theme="@style/PeopleTheme"