summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorEino-Ville Talvala <etalvala@google.com>2013-06-04 09:19:14 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-06-04 09:19:14 -0700
commitcbbd6c8354f7323933081b217ce53461d99215c4 (patch)
tree57c09180d0ba7b904d1900b438ecd9c508fcccb3 /include
parente64d41332776e3c91f51c3239589695bf2cd0aeb (diff)
parent8f908c0c211f8051f339bc85b01a6450f0dfd7d0 (diff)
downloadframeworks_av-cbbd6c8354f7323933081b217ce53461d99215c4.zip
frameworks_av-cbbd6c8354f7323933081b217ce53461d99215c4.tar.gz
frameworks_av-cbbd6c8354f7323933081b217ce53461d99215c4.tar.bz2
am 8f908c0c: Merge "Camera2/3: Don\'t trigger AF when in INFINITY focus mode." into jb-mr2-dev
* commit '8f908c0c211f8051f339bc85b01a6450f0dfd7d0': Camera2/3: Don't trigger AF when in INFINITY focus mode.
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions