From: Greg Hackmann <ghackmann@google.com>
Date: Fri, 9 May 2014 21:46:44 +0000 (+0000)
Subject: am a9d49f99: Merge "Revert "Use asynchronous lock/unlock API""
X-Git-Tag: android-x86-6.0-r1~75^2~232^2~72
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=9eb142e34a5bc11508c0bd6f60ad3933c60aa530;p=android-x86%2Fframeworks-native.git

am a9d49f99: Merge "Revert "Use asynchronous lock/unlock API""

* commit 'a9d49f99e69d8fc0e60b492b131322c96f47a232':
  Revert "Use asynchronous lock/unlock API"
---

9eb142e34a5bc11508c0bd6f60ad3933c60aa530