Commit 4a17a810 authored by Ed Heyl's avatar Ed Heyl Committed by Android Git Automerger
Browse files

am 72dbb5bf: merge in release branch changes (no-op). 

* commit '72dbb5bf':
  camera2: Add updateCaptureRequest method
  camera2: Add #resetState to AutoFocusStateMachine
parents 0cc7337b 72dbb5bf
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