summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorEino-Ville Talvala <etalvala@google.com>2013-06-04 11:17:10 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-06-04 11:17:10 -0700
commit4b58d70b4109648b5d392d6ad4e4512d9ae5afb7 (patch)
tree3eb970ec3647c30c3b37afafbb5f887050b39d6d /media
parentc92ed3339b533afbfb94893de6bb10bc2c0951e9 (diff)
parentcbbd6c8354f7323933081b217ce53461d99215c4 (diff)
downloadframeworks_av-4b58d70b4109648b5d392d6ad4e4512d9ae5afb7.zip
frameworks_av-4b58d70b4109648b5d392d6ad4e4512d9ae5afb7.tar.gz
frameworks_av-4b58d70b4109648b5d392d6ad4e4512d9ae5afb7.tar.bz2
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.
Diffstat (limited to 'media')
0 files changed, 0 insertions, 0 deletions