commit | 4a17a810422152367bece35c1756d8c553efc01f | [log] [tgz] |
---|---|---|
author | Ed Heyl <edheyl@google.com> | Fri Nov 08 13:31:33 2013 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 08 13:31:33 2013 -0800 |
tree | be435cc2d7d10b9f13546a175d2469b4e6474358 | |
parent | 0cc7337bac5b1e5368baa896afef0ed41490e69e [diff] | |
parent | 72dbb5bf7e2e40cc5c2a31d09b079cb053b1b639 [diff] |
am 72dbb5bf: merge in release branch changes (no-op). * commit '72dbb5bf7e2e40cc5c2a31d09b079cb053b1b639': camera2: Add updateCaptureRequest method camera2: Add #resetState to AutoFocusStateMachine