OSDN Git Service

am a9d49f99: Merge "Revert "Use asynchronous lock/unlock API""
authorGreg Hackmann <ghackmann@google.com>
Fri, 9 May 2014 21:46:44 +0000 (21:46 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 9 May 2014 21:46:44 +0000 (21:46 +0000)
* commit 'a9d49f99e69d8fc0e60b492b131322c96f47a232':
  Revert "Use asynchronous lock/unlock API"


Trivial merge