tree 7dd6e84d11bc68fee8f06fae9026d7e15c988874
parent bc3699b1c3e0b2d07adb0919ef2a418546a7838c
parent a0bb44efe96ca70635b64dac8922b225d1a19407
author Craig Mautner <cmautner@google.com> 1406254793 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1406254793 +0000

am a0bb44ef: Merge "Finish crashed activities immediately" into klp-modular-dev

* commit 'a0bb44efe96ca70635b64dac8922b225d1a19407':
  Finish crashed activities immediately