tree 12efb90224f4b06a2244c64885f42d8ba470bec1
parent fa7ccca691d9b77bf404160b2e8d5e82c2fe9acc
parent 45023a31c2f024a3b6f4455b03991f21dae04b52
author Emilian Peev <epeev@google.com> 1499281132 +0000
committer android-build-merger <android-build-merger@google.com> 1499281132 +0000

Merge "QCamera3: Avoid possible deadlock when reporting failed buffers" into oc-dr1-dev
am: 45023a31c2

Change-Id: I7d8477666fd2863e579f6a2839fd6e01fe562b82