diff options
| author | Ed Heyl <edheyl@google.com> | 2013-11-08 13:31:33 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-08 13:31:33 -0800 |
| commit | 4a17a810422152367bece35c1756d8c553efc01f (patch) | |
| tree | be435cc2d7d10b9f13546a175d2469b4e6474358 | |
| parent | 0cc7337bac5b1e5368baa896afef0ed41490e69e (diff) | |
| parent | 72dbb5bf7e2e40cc5c2a31d09b079cb053b1b639 (diff) | |
| download | android_frameworks_ex-4a17a810422152367bece35c1756d8c553efc01f.tar.gz android_frameworks_ex-4a17a810422152367bece35c1756d8c553efc01f.tar.bz2 android_frameworks_ex-4a17a810422152367bece35c1756d8c553efc01f.zip | |
am 72dbb5bf: merge in release branch changes (no-op).
* commit '72dbb5bf7e2e40cc5c2a31d09b079cb053b1b639':
camera2: Add updateCaptureRequest method
camera2: Add #resetState to AutoFocusStateMachine
0 files changed, 0 insertions, 0 deletions