tree 81405c6b7ba580a9047377c946bc0799f2535d78
parent 96df633e09fde745a502637f96c87daaa71dc720
parent 9e0561a787b80d1c96e40741b3ee8f4bb456d1f8
author Yin-Chia Yeh <yinchiayeh@google.com> 1500511297 +0000
committer android-build-merger <android-build-merger@google.com> 1500511297 +0000

Merge "Camera: fix deadlock with flush" into oc-dr1-dev am: 679b6f6eaa
am: 9e0561a787

Change-Id: I688acc2229679fab0ae38f4c256619a96c0f291b