commit | eacf623073c5ea7bd6c2770d8347aaf546d2554c | [log] [tgz] |
---|---|---|
author | Igor Murashkin <iam@google.com> | Mon Jun 23 19:41:18 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 23 19:41:18 2014 +0000 |
tree | 7f7e31c000c122338b27efc695fe71f5b3cd454c | |
parent | 535efff41e7b24c7278777c3e64405da8b25eb74 [diff] | |
parent | dbbf87fdcf5adde06a7c8c0421fb71523090f0ce [diff] |
am dbbf87fd: am 6b9345ec: am 08dbbb52: am 9fcc8956: Merge "camera2: Add passive unfocused state to AF state machine" into klp-dev * commit 'dbbf87fdcf5adde06a7c8c0421fb71523090f0ce':