summaryrefslogtreecommitdiffstats
path: root/media/libmedia/MediaScanner.cpp
diff options
context:
space:
mode:
authorJeff Tinker <jtinker@google.com>2015-09-17 17:20:42 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-09-17 17:20:42 +0000
commit75f0b792547f699761cb2b538b1dc1d020567238 (patch)
tree600ae3207949898e61011fedadd6cbfa628df4fe /media/libmedia/MediaScanner.cpp
parent4296d7df2a626f3340c2b829b5fcf2e8b2f79540 (diff)
parentdffe5cdb436987a65a9010460979507c06b5c904 (diff)
downloadframeworks_av-75f0b792547f699761cb2b538b1dc1d020567238.zip
frameworks_av-75f0b792547f699761cb2b538b1dc1d020567238.tar.gz
frameworks_av-75f0b792547f699761cb2b538b1dc1d020567238.tar.bz2
am dffe5cdb: Merge "DO NOT MERGE Fix vulnerability in mediaserver" into mnc-dev
* commit 'dffe5cdb436987a65a9010460979507c06b5c904': DO NOT MERGE Fix vulnerability in mediaserver
Diffstat (limited to 'media/libmedia/MediaScanner.cpp')
0 files changed, 0 insertions, 0 deletions