tree c601b1faa3045c0ed9881058354d9c15b6418455
parent fa6d012d88f2223f0f4510f310452668500f1bcf
parent f0e82a7a5381ad231aaf0b2c71c69476d1c88d3f
author Chien-Yu Chen <cychen@google.com> 1505165039 +0000
committer android-build-merger <android-build-merger@google.com> 1505165039 +0000

Merge "QCamera3: Fix deadlock during Easel fatal error" into oc-mr1-dev
am: f0e82a7a53

Change-Id: I7e06ef2fbc03742ddac89a5624f6af2167a44c92