tree bba1103440af30c8275cde7dbe09866069680afe
parent 5a1ca138be2e45284a3a5ad33977ee774a57a56d
parent 2d91d000bce3db23ac51888d109c9f29272ea96a
author Greg Hackmann <ghackmann@google.com> 1399672005 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1399672005 +0000

am 2d91d000: Merge "Revert "gralloc: Add asynchronous lock/unlock API""

* commit '2d91d000bce3db23ac51888d109c9f29272ea96a':
  Revert "gralloc: Add asynchronous lock/unlock API"