tree baa08d72a139046c4b29f2851cefce5cc820d7bd
parent 1101c1eb1a2c670bee7689587504de34d0306882
parent 9492b6e72cef71422ba624e3cd11f07156cfb34a
author Christopher Ferris <cferris@google.com> 1381385339 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381385339 -0700

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

* commit '9492b6e72cef71422ba624e3cd11f07156cfb34a':
  Fix bug in abort message processing.