tree 38ec61c3501f45e0a28ad4536c759c5a63e435e3
parent d2203aa0c832469822cd570bd36c26139859a3d3
parent 770379e17e694ec6e08f1edb690a5e33ab81c684
author Andy McFadden <fadden@android.com> 1272052817 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1272052817 -0700

am 770379e1: am 6efd4463: Fix a deadlock in the breakpoint code.

Merge commit '770379e17e694ec6e08f1edb690a5e33ab81c684' into kraken

* commit '770379e17e694ec6e08f1edb690a5e33ab81c684':
  Fix a deadlock in the breakpoint code.