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