tree 6886fa41eccded2dfb1c028f9740544cce1d5ca3
parent 35216c7afb58dea26f454371e7b8dac9f742295b
parent 6c5cc576e747a38cf6feef39a578d9cccb0ba251
author Igor Murashkin <iam@google.com> 1380678278 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1380678278 -0700

am 6c5cc576: Merge "camera2: Add state machine for doing auto-focus easily from apps" into klp-dev

* commit '6c5cc576e747a38cf6feef39a578d9cccb0ba251':
  camera2: Add state machine for doing auto-focus easily from apps