auto import from //depot/cupcake/@135843
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
new file mode 100644
index 0000000..025d495
--- /dev/null
+++ b/AndroidManifest.xml
@@ -0,0 +1,163 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2008 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.email">
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
+    <uses-permission android:name="android.permission.READ_CONTACTS"/>
+    <uses-permission android:name="android.permission.READ_OWNER_DATA"/>
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.VIBRATE"/>
+    <permission android:name="com.android.email.permission.READ_ATTACHMENT"
+                android:permissionGroup="android.permission-group.MESSAGES"
+                android:protectionLevel="dangerous"
+                android:label="@string/read_attachment_label"
+                android:description="@string/read_attachment_desc"/>
+    <uses-permission android:name="com.android.email.permission.READ_ATTACHMENT"/>
+    <application android:icon="@drawable/icon" android:label="@string/app_name"
+        android:name="Email">
+        <activity android:name=".activity.Welcome">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+
+        <activity
+            android:name=".activity.setup.AccountSetupBasics"
+            android:label="@string/account_setup_basics_title"
+            >
+        </activity>
+        <activity
+            android:name=".activity.setup.AccountSetupAccountType"
+            android:label="@string/account_setup_account_type_title"
+            >
+        </activity>
+        <activity
+            android:name=".activity.setup.AccountSetupIncoming"
+            android:label="@string/account_setup_incoming_title"
+            >
+        </activity>
+        <activity
+            android:name=".activity.setup.AccountSetupOutgoing"
+            android:label="@string/account_setup_outgoing_title"
+            >
+        </activity>
+        <activity
+            android:name=".activity.setup.AccountSetupOptions"
+            android:label="@string/account_setup_options_title"
+            >
+        </activity>
+        <activity
+            android:name=".activity.setup.AccountSetupNames"
+            android:label="@string/account_setup_names_title"
+            >
+        </activity>
+        <!-- XXX Note: this activity is hacked to ignore config changes,
+             since it doesn't currently handle them correctly in code. -->
+        <activity
+            android:name=".activity.setup.AccountSetupCheckSettings"
+            android:label="@string/account_setup_check_settings_title"
+            android:configChanges="keyboardHidden|orientation"
+            >
+        </activity>
+        <activity
+            android:name=".activity.setup.AccountSettings"
+            android:label="@string/account_settings_action"
+            >
+        </activity>
+
+        <activity
+            android:name=".activity.Debug"
+            android:label="@string/debug_title">
+        </activity>
+        <activity
+            android:name=".activity.Accounts"
+            android:label="@string/accounts_title"
+            android:launchMode="singleTop" >
+        </activity>
+        
+        <activity 
+            android:name=".activity.AccountShortcutPicker"
+            android:label="@string/app_name"
+            android:enabled="false"
+            >
+            <intent-filter>
+                <action android:name="android.intent.action.CREATE_SHORTCUT" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+        
+        <activity
+            android:name=".activity.FolderMessageList">
+            <intent-filter>
+                <!-- This action is only to allow an entry point for launcher shortcuts -->
+                <action android:name="android.intent.action.MAIN" />
+            </intent-filter>
+        </activity>
+        <activity
+            android:name=".activity.MessageView"
+            android:theme="@android:style/Theme.NoTitleBar" >
+        </activity>
+        <activity
+            android:name=".activity.MessageCompose"
+            android:label="@string/app_name"
+            android:enabled="false"
+            >
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <action android:name="android.intent.action.SENDTO" />
+                <data android:scheme="mailto" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+            </intent-filter>
+            <intent-filter android:label="@string/app_name">
+                <action android:name="android.intent.action.SEND" />
+                <data android:mimeType="text/plain" />
+                <data android:mimeType="image/*" />
+                <data android:mimeType="video/*" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+        <receiver android:name=".service.BootReceiver"
+              android:enabled="false"
+              >
+            <intent-filter>
+                <action android:name="android.intent.action.BOOT_COMPLETED" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.DEVICE_STORAGE_LOW" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.DEVICE_STORAGE_OK" />
+            </intent-filter>
+        </receiver>
+        <service
+            android:name=".service.MailService"
+            android:enabled="false"
+            >
+        </service>
+        <provider
+            android:name=".provider.AttachmentProvider"
+            android:authorities="com.android.email.attachmentprovider"
+            android:multiprocess="true"
+            android:grantUriPermissions="true"
+            android:readPermission="com.android.email.permission.READ_ATTACHMENT"
+            />
+    </application>
+</manifest>