| commit | 2f3dca149a2bcae96f18e38f7ba99a95c3e1b08c | [log] [tgz] |
|---|---|---|
| author | Greg Hackmann <ghackmann@google.com> | Fri May 09 22:00:04 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 09 22:00:04 2014 +0000 |
| tree | c42170cdac8e30c84813a2723fbb89689b7d2463 | |
| parent | 02528cf6aaedbbfec55be57d33389e1c57d88245 [diff] | |
| parent | 9493d4924a59f14b698389386337a9c07a7ea3c4 [diff] |
am 9493d492: am 9eb142e3: am a9d49f99: Merge "Revert "Use asynchronous lock/unlock API"" * commit '9493d4924a59f14b698389386337a9c07a7ea3c4': Revert "Use asynchronous lock/unlock API"