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