tree f97684690083e2e54c1a64376e2565ff87563851
parent 5b2eece6aaa1c2e56ebb42240cd855bfd22a3a9e
parent 2e250c826b3c405d675017efe79e5db3651c9ee6
author Brian Carlstrom <bdc@google.com> 1376544795 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1376544795 -0700

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

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