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)
commitc8ae7db82bc8d2dda9996fe3060dcfe5eed982f2
treeff13d9bdaefe93092487454cab511871c64f32e2
parent823b6475852f02d694857dc41977079b35870594
parent7d740cf6430a86edca1fcf20fd974b53b00136f8
am 7d740cf6: am 53bc3719: Merge "Fixing a crash when doing lock profiling"

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