From: Elliott Hughes <enh@google.com>
Date: Tue, 5 Jun 2012 22:18:06 +0000 (-0700)
Subject: am 7d740cf6: am 53bc3719: Merge "Fixing a crash when doing lock profiling"
X-Git-Tag: android-x86-4.4-r1~326
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c8ae7db82bc8d2dda9996fe3060dcfe5eed982f2;p=android-x86%2Fdalvik.git

am 7d740cf6: am 53bc3719: Merge "Fixing a crash when doing lock profiling"

* commit '7d740cf6430a86edca1fcf20fd974b53b00136f8':
  Fixing a crash when doing lock profiling
---

c8ae7db82bc8d2dda9996fe3060dcfe5eed982f2