commit fbb0ba491042a7f8fb38f51b2f0538ca8fd074a6
author Brian Carlstrom <bdc@google.com> Wed Aug 14 22:36:26 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Aug 14 22:36:26 2013 -0700
tree a6ffcb9b0e9c8c0f7fee5da451a4527e7023e009
parent f80f2bc2541df590994d682145182f630edb9714
parent ec5683a4c79c3df6bec9329e59999bbc1e4a636a

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

* commit 'ec5683a4c79c3df6bec9329e59999bbc1e4a636a':
  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