commit | 1e7f09eec55b7b3db6d4b522eb83f2025b4f2523 | [log] [tgz] |
---|---|---|
author | Eino-Ville Talvala <etalvala@google.com> | Wed Sep 25 12:34:42 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 25 12:34:42 2013 -0700 |
tree | d78fb2c145132464a056443f9c24f2db6032f486 | |
parent | 6b8bbad2d35f8f2e40abb8bbf3f13cfeff842468 [diff] | |
parent | 9c73c0a2f2c39cc5e2e1f5d92eaf1fc4b61beb1d [diff] |
am 9c73c0a2: am 89cfe208: Merge "Camera3: Add PASSIVE_UNFOCUSED AF state and clean up INACTIVE" into klp-dev * commit '9c73c0a2f2c39cc5e2e1f5d92eaf1fc4b61beb1d': Camera3: Add PASSIVE_UNFOCUSED AF state and clean up INACTIVE