OSDN Git Service

am 44124c94: (-s ours) am 980417bf: Merge "ART: On shutdown, only warn on mutex conte...
authorAndreas Gampe <agampe@google.com>
Fri, 23 Jan 2015 22:53:46 +0000 (22:53 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 23 Jan 2015 22:53:46 +0000 (22:53 +0000)
* commit '44124c94e7eb28d2d952cbbf18c3ea5e14ebd4b0':
  ART: On shutdown, only warn on mutex contention


Trivial merge