| commit | 9eb142e34a5bc11508c0bd6f60ad3933c60aa530 | [log] [tgz] |
|---|---|---|
| author | Greg Hackmann <ghackmann@google.com> | Fri May 09 21:46:44 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 09 21:46:44 2014 +0000 |
| tree | 60ead93b37ba9d8e790ea570335a4cd2ea01197e | |
| parent | 8a6cd189034ec4709a66e581b41deba56c028291 [diff] | |
| parent | a9d49f99e69d8fc0e60b492b131322c96f47a232 [diff] |
am a9d49f99: Merge "Revert "Use asynchronous lock/unlock API"" * commit 'a9d49f99e69d8fc0e60b492b131322c96f47a232': Revert "Use asynchronous lock/unlock API"