| commit | 9493d4924a59f14b698389386337a9c07a7ea3c4 | [log] [tgz] |
|---|---|---|
| author | Greg Hackmann <ghackmann@google.com> | Fri May 09 21:51:51 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 09 21:51:51 2014 +0000 |
| tree | 98651c15faa330ec60118537abcb79225b5adcfd | |
| parent | 4b46776ff88c5a365700b88e8b2b04e1b2c77e6e [diff] | |
| parent | 9eb142e34a5bc11508c0bd6f60ad3933c60aa530 [diff] |
am 9eb142e3: am a9d49f99: Merge "Revert "Use asynchronous lock/unlock API"" * commit '9eb142e34a5bc11508c0bd6f60ad3933c60aa530': Revert "Use asynchronous lock/unlock API"