tree ef3cf0d267c9d6951e15f6cdd6095ddc95b98fac
parent 214b4a61ac3fa63e35c79157d3acf0d8b692b3ac
parent f60564a13e917877c76c99294194a621d872076b
author Greg Hackmann <ghackmann@google.com> 1399669719 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1399669719 +0000

am f60564a1: Merge "Use asynchronous lock/unlock API"

* commit 'f60564a13e917877c76c99294194a621d872076b':
  Use asynchronous lock/unlock API