tree f0b1620a561469b74aaec6594e674b34c2825eb7
parent 98730cd7456b32255a37d691a70f49df22975a72
parent ca3fb120f5697c05e3ea1a50abe913a9cc4a8d73
author Igor Murashkin <iam@google.com> 1369341855 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1369341855 -0700

am ca3fb120: Merge "camera3: Fix zsl buffers released-while-in-use race condition" into jb-mr2-dev

* commit 'ca3fb120f5697c05e3ea1a50abe913a9cc4a8d73':
  camera3: Fix zsl buffers released-while-in-use race condition