am d1b710bc: am 04f07d28: am 2a555d0a: am d3edd1c2: am ba164dfb: Merge...
am d1b710bc: am 04f07d28: am 2a555d0a: am d3edd1c2: am ba164dfb: Merge "camera2: Fix race conditions and deadlocks around configuration" into lmp-dev
* commit 'd1b710bc':
camera2: Fix race conditions and deadlocks around configuration