tree f4534290a82aca40a8f9a49dd7ac255001159c5b
parent 3bf3b45f2d5eb43b74e1a46ff03ed3e2142b1b38
parent 4d45d30d4e6d129218835a3209d8fb016d768ce4
author Eino-Ville Talvala <etalvala@google.com> 1380137274 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1380137274 +0000

Merge "Camera3: Add PASSIVE_UNFOCUSED AF state and clean up INACTIVE" into klp-dev