tree db522970675c8149535f004910e73bb161871f4e
parent 32ce52b01dab863f2b4749e1c69f619cf820486f
parent 69a374897392c8bd70f441b7284f6f578c651ec9
author Zhijun He <zhijunhe@google.com> 1395709705 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1395709705 +0000

Merge "Camera3: Fix flush call deadlock"