[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 oc-mr1-dev am: 6ffa41ea54 -s ours am: 3b224076f2 -s ours am: 45f0980acd -s ours
am: 5791c2468c -s ours
am skip reason: change_id Iff7a42a3248a8b45cf128d2335624fc298c8888c with SHA1 2398f2f4d2 is in history

Change-Id: Ib5cc383a5c97c3b8379623b173abd6adf444eb98