tree 2cb2004154a637183629c5c1f9a1ef9dc8a29fd6
parent a7e8f8615d357357712660d1ed3863c274c2c7bb
parent a7952c5c5911f612fd1f99259f2e06dc9d1b319d
author Elliott Hughes <enh@google.com> 1400287800 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400287800 +0000

am a7952c5c: am 5e742107: am c4afc192: Merge "Add SIGTRAP support to crasher and debuggerd."

* commit 'a7952c5c5911f612fd1f99259f2e06dc9d1b319d':
  Add SIGTRAP support to crasher and debuggerd.