OSDN Git Service

am 7d12781a: Merge "Add additional context to the contention event logging." into...
authorCarl Shapiro <cshapiro@google.com>
Thu, 2 Sep 2010 18:35:31 +0000 (11:35 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 2 Sep 2010 18:35:31 +0000 (11:35 -0700)
Merge commit '7d12781a1d2d4d4b2e3a6c78a375cb15ea2d96ae' into gingerbread-plus-aosp

* commit '7d12781a1d2d4d4b2e3a6c78a375cb15ea2d96ae':
  Add additional context to the contention event logging.


Trivial merge