Merge \\\"Add non-parcelable extras to notification to make sure it does not crash the app.\\\" into nyc-dev am: c72edd7a89 am: 5d53b301dc
am: 64bc0d5dcc
Change-Id: Ieff870bfcf33b3ab637cccba1b78b8d9c014c85a
This commit is contained in: