OSDN Git Service

am e07c0f48: am f14d72d8: am 7d12781a: Merge "Add additional context to the contentio...
authorCarl Shapiro <cshapiro@google.com>
Thu, 2 Sep 2010 18:44:45 +0000 (11:44 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 2 Sep 2010 18:44:45 +0000 (11:44 -0700)
Merge commit 'e07c0f48a6aa2cb2d6301930e6b4290488cd7b46' into dalvik-dev

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


Trivial merge