summaryrefslogtreecommitdiffstats
path: root/include/media
diff options
context:
space:
mode:
authorEd Heyl <edheyl@google.com>2013-10-16 18:02:14 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-10-16 18:02:14 -0700
commit85b56a702f155cda9b945bcbadaa89e0f9ecc4a8 (patch)
tree63b0822af3070bf67bf4ab0e841c9d7165ab9750 /include/media
parentd6c628f6db7e1b5079cb9a60cf84208891001ec4 (diff)
parentfc24dc1a2e2ba8d74bfadfadb01d12a542828561 (diff)
downloadframeworks_av-85b56a702f155cda9b945bcbadaa89e0f9ecc4a8.zip
frameworks_av-85b56a702f155cda9b945bcbadaa89e0f9ecc4a8.tar.gz
frameworks_av-85b56a702f155cda9b945bcbadaa89e0f9ecc4a8.tar.bz2
am fc24dc1a: am 787c0d04: merge in klp-release (no-op)
* commit 'fc24dc1a2e2ba8d74bfadfadb01d12a542828561': Camera: Skip AE precapture when possible Cleanup openRecord error handling TimedEventQueue takes a wake lock fix offload audio effect proxy implementation uuid MediaCodecInfo: report supported color formats for non-native-window mode Camera2 API: Hack: Always use async mode with GLConsumer AudioTrack: fix music resume
Diffstat (limited to 'include/media')
0 files changed, 0 insertions, 0 deletions