OSDN Git Service

am 7d740cf6: am 53bc3719: Merge "Fixing a crash when doing lock profiling"
authorElliott Hughes <enh@google.com>
Tue, 5 Jun 2012 22:18:06 +0000 (15:18 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 5 Jun 2012 22:18:06 +0000 (15:18 -0700)
* commit '7d740cf6430a86edca1fcf20fd974b53b00136f8':
  Fixing a crash when doing lock profiling


Trivial merge