Commit ccb2d741 authored by Sol Boucher's avatar Sol Boucher Committed by Android Git Automerger
Browse files

am 90aa7e81: Merge "camera2-portability: Add focus locks and touch-to-focus for API 2" into lmp-dev 

* commit '90aa7e81':
  camera2-portability: Add focus locks and touch-to-focus for API 2
parents 8eb8a70d 90aa7e81
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment