[automerger skipped] Merge "Deleted "<action android:name="android.intent.action.SEND_MULTIPLE" />" in "com.android.email.activity.ComposeActivityEmailExternal" activity of the AndroidManifest.xml as part of cleanup." into pi-dev
am: 01a89caf3b -s ours
am skip reason: change_id Iff7a42a3248a8b45cf128d2335624fc298c8888c with SHA1 8e75186d72 is in history

Change-Id: I1f93165d8fcc12d7ae30a55571d497144b4695ba