tree eb4df04fb617e8ba7a6450408b99310fcc6969a6
parent c392a20e5e193c03d0d2d4ae0548fc4429d57164
parent 0691c4701cf8cd32db1bc034dc5f544a807aeb3d
author Carl Shapiro <cshapiro@google.com> 1271806681 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1271806681 -0700

am 0691c470: am 6f7ec8e6: am 28f4d74b: Merge "Remove dangerous logging code from unlockMonitor.  It is unsafe to dereference a potentially corrupt lock word to retrieve additional information about the lock state.  This code was added to debug a transient error and ha

Merge commit '0691c4701cf8cd32db1bc034dc5f544a807aeb3d' into dalvik-dev

* commit '0691c4701cf8cd32db1bc034dc5f544a807aeb3d':
  Remove dangerous logging code from unlockMonitor.  It is unsafe to