summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorChien-Yu Chen <cychen@google.com>2014-11-12 23:40:00 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-11-12 23:40:00 +0000
commit7deab61ade08ffd0971323594ded4937e2db8265 (patch)
treeb68abf854a5db70318ceab12ae9c5fbf39cf7426 /media
parentcea67364cee2c8e2e9baae86276cdeb0e13c8c0d (diff)
parent06ce4cf5e3f8715635bc1913dcbb1d32fbd510a7 (diff)
downloadframeworks_av-7deab61ade08ffd0971323594ded4937e2db8265.zip
frameworks_av-7deab61ade08ffd0971323594ded4937e2db8265.tar.gz
frameworks_av-7deab61ade08ffd0971323594ded4937e2db8265.tar.bz2
am 06ce4cf5: Merge "Camera2Device: fix camera metadata leaks" into lmp-mr1-dev automerge: 7c77c75
* commit '06ce4cf5e3f8715635bc1913dcbb1d32fbd510a7': Camera2Device: fix camera metadata leaks
Diffstat (limited to 'media')
0 files changed, 0 insertions, 0 deletions