commit | 3c3367ca4b998375e8bcadc68bff37286de0bd51 | [log] [tgz] |
---|---|---|
author | Igor Murashkin <iam@google.com> | Mon Jun 23 19:50:06 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 23 19:50:06 2014 +0000 |
tree | b3b5c36a167e4d77bbbd612e9f2a90cb287fcd60 | |
parent | c3cfd0c4fdfc7a0033a5adc6aa0a51e59a7d7d20 [diff] | |
parent | 252eb8479f17e384da1321a5fb974f5eb87dbb12 [diff] |
am 252eb847: am e88d7fe6: am 6c5cc576: Merge "camera2: Add state machine for doing auto-focus easily from apps" into klp-dev * commit '252eb8479f17e384da1321a5fb974f5eb87dbb12':