commit | b7289e33f94b62ef1bb5ca7ff8d33d645d647c16 | [log] [tgz] |
---|---|---|
author | Igor Murashkin <iam@google.com> | Tue Oct 01 20:59:04 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 01 20:59:04 2013 -0700 |
tree | 6886fa41eccded2dfb1c028f9740544cce1d5ca3 | |
parent | e88d7fe6975b037909879f96eeae128e308ef508 [diff] | |
parent | 8fee1a5ae5cea6f5eaf5d29a2e8793122df6c7a3 [diff] |
am 8fee1a5a: am 6c5cc576: Merge "camera2: Add state machine for doing auto-focus easily from apps" into klp-dev * commit '8fee1a5ae5cea6f5eaf5d29a2e8793122df6c7a3':