tree cfd3c03b79e0b538933b80d7a34c74693ef684b9
parent 180c2ba763c32793c6d3c5fe2683f8f2b233ca10
parent 94ee9b5916903e6ee23bb1ce8f688900a4eb6f65
author Lajos Molnar <lajos@google.com> 1422520895 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422520895 +0000

am 94ee9b59: Merge "CpuConsumer: lock buffers that could be YUV as ycbcr" into lmp-mr1-dev

* commit '94ee9b5916903e6ee23bb1ce8f688900a4eb6f65':
  CpuConsumer: lock buffers that could be YUV as ycbcr