| commit | 6889dfab1a88f584d6eeb91cd37e1ad09988961a | [log] [tgz] |
|---|---|---|
| author | Ed Heyl <edheyl@google.com> | Fri Nov 08 14:02:41 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 08 14:02:41 2013 -0800 |
| tree | acdc82aeaa5aaf34c9d8ae1ed3bdd88aded29def | |
| parent | 44aacce1e8de2a82c69fa0e0293d26acd32824ae [diff] | |
| parent | e0b8940b924359ee45bc8c755f666dd4bd370d16 [diff] |
am e0b8940b: am 4a17a810: am 72dbb5bf: merge in release branch changes (no-op). * commit 'e0b8940b924359ee45bc8c755f666dd4bd370d16': camera2: Add updateCaptureRequest method camera2: Add #resetState to AutoFocusStateMachine