OSDN Git Service

Merge "Camera3: Add PASSIVE_UNFOCUSED AF state and clean up INACTIVE" into klp-dev
authorEino-Ville Talvala <etalvala@google.com>
Wed, 25 Sep 2013 19:27:54 +0000 (19:27 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 25 Sep 2013 19:27:54 +0000 (19:27 +0000)

Trivial merge