tree e5d1028504073837a0a6ffd4d87364abb7c315fc
parent 800736df79e6a8296220ed84740ec54303bc7bac
parent e19a81b20c7842191763160bc6482efe15312b3f
author Raman Tenneti <rtenneti@google.com> 1561775007 -0700
committer android-build-merger <android-build-merger@google.com> 1561775007 -0700

[automerger] AOSP/Email - Create an empty Bundle if originalExtras doesn't exit. Backporting the fix to fix NullPointerException. am: 3150b66305 am: f384b385ea am: c2b3e391ba am: 6b22b904fb am: ae61fe4c0a am: 721f9c585c am: 56b7e4558e
am: e19a81b20c

Change-Id: I8813892688a97bad04e9c57833e23203bcace2a7