| commit | 252eb8479f17e384da1321a5fb974f5eb87dbb12 | [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 | 1e3959d2b7fe0e8eecf72b57a6cb6e98371b158a [diff] | |
| parent | e88d7fe6975b037909879f96eeae128e308ef508 [diff] |
am e88d7fe6: am 6c5cc576: Merge "camera2: Add state machine for doing auto-focus easily from apps" into klp-dev * commit 'e88d7fe6975b037909879f96eeae128e308ef508':