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

author Igor Murashkin <iam@google.com>

Thu, 23 May 2013 20:42:32 +0000 (20:42 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Thu, 23 May 2013 20:42:32 +0000 (20:42 +0000)
author Igor Murashkin <iam@google.com>
Thu, 23 May 2013 20:42:32 +0000 (20:42 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 23 May 2013 20:42:32 +0000 (20:42 +0000)
diff --cc services/camera/libcameraservice/camera2/ZslProcessor3.cpp
Simple merge
author	Igor Murashkin <iam@google.com>
	Thu, 23 May 2013 20:42:32 +0000 (20:42 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 23 May 2013 20:42:32 +0000 (20:42 +0000)