tree c42170cdac8e30c84813a2723fbb89689b7d2463
parent 02528cf6aaedbbfec55be57d33389e1c57d88245
parent 9493d4924a59f14b698389386337a9c07a7ea3c4
author Greg Hackmann <ghackmann@google.com> 1399672804 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1399672804 +0000

am 9493d492: am 9eb142e3: am a9d49f99: Merge "Revert "Use asynchronous lock/unlock API""

* commit '9493d4924a59f14b698389386337a9c07a7ea3c4':
  Revert "Use asynchronous lock/unlock API"