OSDN Git Service

am cbbd6c83: am 8f908c0c: Merge "Camera2/3: Don\'t trigger AF when in INFINITY focus...
authorEino-Ville Talvala <etalvala@google.com>
Tue, 4 Jun 2013 18:17:10 +0000 (11:17 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 4 Jun 2013 18:17:10 +0000 (11:17 -0700)
commit4b58d70b4109648b5d392d6ad4e4512d9ae5afb7
tree3eb970ec3647c30c3b37afafbb5f887050b39d6d
parentc92ed3339b533afbfb94893de6bb10bc2c0951e9
parentcbbd6c8354f7323933081b217ce53461d99215c4
am cbbd6c83: am 8f908c0c: Merge "Camera2/3: Don\'t trigger AF when in INFINITY focus mode." into jb-mr2-dev

* commit 'cbbd6c8354f7323933081b217ce53461d99215c4':
  Camera2/3: Don't trigger AF when in INFINITY focus mode.
services/camera/libcameraservice/Camera2Client.cpp