| commit | b94757d81034d61d0a5be20582cf72394d844ae5 | [log] [tgz] |
|---|---|---|
| author | Igor Murashkin <iam@google.com> | Mon Jun 23 19:41:16 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 23 19:41:16 2014 +0000 |
| tree | 7f7e31c000c122338b27efc695fe71f5b3cd454c | |
| parent | 252eb8479f17e384da1321a5fb974f5eb87dbb12 [diff] | |
| parent | b7289e33f94b62ef1bb5ca7ff8d33d645d647c16 [diff] |
am b7289e33: am 8fee1a5a: am 6c5cc576: Merge "camera2: Add state machine for doing auto-focus easily from apps" into klp-dev * commit 'b7289e33f94b62ef1bb5ca7ff8d33d645d647c16':