Commits
Zhijun He authored and Android Git Automerger committed fd128ff0d66M
am b208861e: am aea8ec1a: Merge "Camera2: Fix Camera integration test deadlock" into klp-dev * commit 'b208861ef74442ff888e1aaed61b95077364d685': Camera2: Fix Camera integration test deadlock
Showing diff toecaeabe33a5