commit a7e8919e4aae44274f5427f11d74fe3bc045c9c7
author Brian Carlstrom <bdc@google.com> Wed Aug 14 22:33:15 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Aug 14 22:33:15 2013 -0700
tree f97684690083e2e54c1a64376e2565ff87563851
parent 5b2eece6aaa1c2e56ebb42240cd855bfd22a3a9e
parent 2e250c826b3c405d675017efe79e5db3651c9ee6

am 2e250c82: Revert "Always enable lock level checks."

* commit '2e250c826b3c405d675017efe79e5db3651c9ee6':
  Revert "Always enable lock level checks."

runtime/base/mutex.h

diff --git a/runtime/base/mutex.h b/runtime/base/mutex.h
index 0e5445f..297a63d 100644
--- a/runtime/base/mutex.h
+++ b/runtime/base/mutex.h
@@ -47,7 +47,7 @@
 class ScopedContentionRecorder;
 class Thread;
 
-const bool kDebugLocking = true || kIsDebugBuild;
+const bool kDebugLocking = kIsDebugBuild;
 
 // Record Log contention information, dumpable via SIGQUIT.
 #ifdef ART_USE_FUTEXES