Merge "Merge "Simplify crash dialog" into nyc-dev am: 9764fea483 am: b1ca71dc16" into nyc-mr1-dev-plus-aosp
am: 4dc61a31fc
* commit '4dc61a31fc02aadbb05909f184cb3575e4f6b648':
Change-Id: I0176738fc7fe6ea3645ecd093abd0e8001c9d1b2
This commit is contained in: