commit 6923a587e5cf67f5d08c232689a6b2616d2282f6
author Brian Attwell <brianattwell@google.com> Tue May 12 19:48:34 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue May 12 19:48:34 2015 +0000
tree 07c8785cd36d373fcd026992b1b969013e3e9c61
parent 19398896713e94bf270f0582fa8300176fc78e54
parent 2dca7e6959e9d47cdf0f325a56bd9d716177ed92

am 2dca7e69: am 4244689e: Merge "add RequestImportVCardPermissionsActivity to manifest" into mnc-dev

* commit '2dca7e6959e9d47cdf0f325a56bd9d716177ed92':
  add RequestImportVCardPermissionsActivity to manifest

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 8ca8e4c..fc5fed6 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"