summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Attwell <brianattwell@google.com>2015-05-12 19:25:38 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-05-12 19:25:39 +0000
commit4244689ea8d7a89ff41c0a0035047e33451dacf9 (patch)
tree53d60f7b1b0cc188ab12c49f13637f31075ea61f
parent97e70fcea88ec2bc70f83f09f095aaf3a293553f (diff)
parentbd53eb4bdc90d7065cea770ca456c454bfb72f47 (diff)
Merge "add RequestImportVCardPermissionsActivity to manifest" into mnc-dev
-rw-r--r--AndroidManifest.xml6
1 files changed, 6 insertions, 0 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 8ca8e4c97..fc5fed635 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -197,6 +197,12 @@
android:label="@string/custom_list_filter"
android:theme="@style/ContactListFilterTheme"/>
+ <activity
+ android:name="com.android.contacts.common.activity.RequestImportVCardPermissionsActivity"
+ android:label="@string/launcherActivityLabel"
+ android:theme="@style/BackgroundOnlyTheme"
+ android:exported="false"/>
+
<!-- vCard related -->
<activity android:name="com.android.contacts.common.vcard.ImportVCardActivity"
android:configChanges="orientation|screenSize|keyboardHidden"