summaryrefslogtreecommitdiffstats
path: root/media/libmedia
diff options
context:
space:
mode:
authorWei Jia <wjia@google.com>2015-09-04 17:55:45 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-09-04 17:55:45 +0000
commit416001ade18568a682e4ab44dae03c271cfb6127 (patch)
tree76fe806d031a362223877e0a19edef2cd02f2872 /media/libmedia
parent5cb3dc50ab663efd855b9dfc05b25c1a2250d9e8 (diff)
parent1a8444481c32422ea46e2a2062d9d49fc11eeeef (diff)
downloadframeworks_av-416001ade18568a682e4ab44dae03c271cfb6127.zip
frameworks_av-416001ade18568a682e4ab44dae03c271cfb6127.tar.gz
frameworks_av-416001ade18568a682e4ab44dae03c271cfb6127.tar.bz2
am 1a844448: (-s ours) am 933fd689: am ec58a72b: am bf03b948: am 75143f30: am 03b7f72b: (-s ours) am 9d916c77: DO NOT MERGE - libstagefright: sanity check size before dereferencing pointer in Utils.cpp
* commit '1a8444481c32422ea46e2a2062d9d49fc11eeeef': DO NOT MERGE - libstagefright: sanity check size before dereferencing pointer in Utils.cpp
Diffstat (limited to 'media/libmedia')
0 files changed, 0 insertions, 0 deletions