tree 8bab48e4d8049194f7709488f82cc5b6e1248358
parent d553ce4092feefd625e4a4cd073a3d18d4b983c9
parent 51d3d176e35abc8b72e55035b0f7b81388ee044d
author Riley Andrews <riandrews@google.com> 1408482471 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1408482471 +0000

am 51d3d176: Merge "Within CpuConsumer, use gralloc lockAsync/unlockAsync" into lmp-dev

* commit '51d3d176e35abc8b72e55035b0f7b81388ee044d':
  Within CpuConsumer, use gralloc lockAsync/unlockAsync