summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorIgor Murashkin <iam@google.com>2013-05-23 13:45:08 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-05-23 13:45:08 -0700
commit599d83e4f2197968d77d3d106630179c88c8a6d7 (patch)
tree79d76fbef655811bc99d495cf520ba4fc5c16ffb /media
parent7d7bb975026a3b428101cdea11e2d94605f845c1 (diff)
parent9b89c15d9d8abb9408760ffdb022df4c4367685b (diff)
downloadframeworks_av-599d83e4f2197968d77d3d106630179c88c8a6d7.zip
frameworks_av-599d83e4f2197968d77d3d106630179c88c8a6d7.tar.gz
frameworks_av-599d83e4f2197968d77d3d106630179c88c8a6d7.tar.bz2
am 9b89c15d: am ca3fb120: Merge "camera3: Fix zsl buffers released-while-in-use race condition" into jb-mr2-dev
* commit '9b89c15d9d8abb9408760ffdb022df4c4367685b': camera3: Fix zsl buffers released-while-in-use race condition
Diffstat (limited to 'media')
0 files changed, 0 insertions, 0 deletions