summaryrefslogtreecommitdiffstats
path: root/media/libmedia
diff options
context:
space:
mode:
authorEino-Ville Talvala <etalvala@google.com>2014-03-07 01:40:59 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-03-07 01:40:59 +0000
commita11111f9135c98cf4247bbd1a61d7df3053e549e (patch)
treee0603972793777c7a190dd2a1c3c76336098a064 /media/libmedia
parented4d8b28b8ee5a3e4ebc8f73bf4dc86c75a74258 (diff)
parenta413dd621966044753a8fa1f57c76d847b6f4bec (diff)
downloadframeworks_av-a11111f9135c98cf4247bbd1a61d7df3053e549e.zip
frameworks_av-a11111f9135c98cf4247bbd1a61d7df3053e549e.tar.gz
frameworks_av-a11111f9135c98cf4247bbd1a61d7df3053e549e.tar.bz2
Merge changes Id28b35fd,Ie4e64977,I2950f31e into klp-dev
* changes: DO NOT MERGE: Camera: fix focusArea wrong indexing issue DO NOT MERGE: camera2: Fix race with stream deletion during disconnect. DO NOT MERGE: camera2/3: Add protection for still capture path
Diffstat (limited to 'media/libmedia')
0 files changed, 0 insertions, 0 deletions