summaryrefslogtreecommitdiffstats
path: root/camera/Camera.cpp
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2012-08-29 09:45:23 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-08-29 09:45:23 -0700
commitbf30787f2694057e775f3b527b649a9f8074237b (patch)
tree83771a1459fb6660b4daa1bde0a52d0c797b0172 /camera/Camera.cpp
parent0924dd88790ba9cda0d5a86df7d68b7446470fc7 (diff)
parent735d1b926fa3e057c92d74cebacca2f243ead274 (diff)
downloadframeworks_av-bf30787f2694057e775f3b527b649a9f8074237b.zip
frameworks_av-bf30787f2694057e775f3b527b649a9f8074237b.tar.gz
frameworks_av-bf30787f2694057e775f3b527b649a9f8074237b.tar.bz2
am 735d1b92: Merge "avcenc: Don\'t erase the InputBufferInfo before reading info from it"
* commit '735d1b926fa3e057c92d74cebacca2f243ead274': avcenc: Don't erase the InputBufferInfo before reading info from it
Diffstat (limited to 'camera/Camera.cpp')
0 files changed, 0 insertions, 0 deletions