OSDN Git Service

Merge changes I036fbc5f,I979f0107 into nyc-dev am: 60b688876d
authorJoe Onorato <joeo@google.com>
Thu, 21 Apr 2016 22:42:43 +0000 (22:42 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 21 Apr 2016 22:42:43 +0000 (22:42 +0000)
am: a5f89b13a8

* commit 'a5f89b13a8da8fd65421f32551e5fbb52146a837':
  If we can't call into an app process to deliver an intent, crash the process.
  If a crash dialog can't be shown, just kill the process.

Change-Id: Ic0e9d7d849c36b120f14bf62c2608fe0116b67f7


Trivial merge