tree 8186624fb1888b9c09de66a6e18c19f45c954736
parent 885cb6877c303a91538351c17fcc45222784495b
parent f84f7fa4d280e02c5cfc5730c64693f3e20eb5c5
author Christopher Ferris <cferris@google.com> 1381419199 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381419199 -0700

am f84f7fa4: am 9492b6e7: am 2de8102d: Merge "Fix bug in abort message processing."

* commit 'f84f7fa4d280e02c5cfc5730c64693f3e20eb5c5':
  Fix bug in abort message processing.