tree 0a2e9355adf159009a6e44093e0295abeecfafae
parent ae1a434fa1740791ba479da668e8372ca3dcb2a6
parent 4d5d62f404b164b697490d650ad8e82ad79a25f9
author Ian Rogers <irogers@google.com> 1415158635 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1415158635 +0000

am 4d5d62f4: Merge "Make thread dumping more tolerant of broken invariants during abort."

* commit '4d5d62f404b164b697490d650ad8e82ad79a25f9':
  Make thread dumping more tolerant of broken invariants during abort.