am 6e32da82: am 36a8b33a: Merge "camera: Fix race condition between...
am 6e32da82: am 36a8b33a: Merge "camera: Fix race condition between setParameters() and stopPreview()." into klp-dev
* commit '6e32da82':
camera: Fix race condition between setParameters() and stopPreview().