| commit | 06c19bd047d63adcf99094f6f0dd17b58150bba6 | [log] [tgz] |
|---|---|---|
| author | Greg Hackmann <ghackmann@google.com> | Fri May 09 21:46:45 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 09 21:46:45 2014 +0000 |
| tree | bba1103440af30c8275cde7dbe09866069680afe | |
| parent | 5a1ca138be2e45284a3a5ad33977ee774a57a56d [diff] | |
| parent | 2d91d000bce3db23ac51888d109c9f29272ea96a [diff] |
am 2d91d000: Merge "Revert "gralloc: Add asynchronous lock/unlock API"" * commit '2d91d000bce3db23ac51888d109c9f29272ea96a': Revert "gralloc: Add asynchronous lock/unlock API"