summaryrefslogtreecommitdiffstats
path: root/include/media
diff options
context:
space:
mode:
authorWei Jia <wjia@google.com>2015-10-06 16:38:51 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-10-06 16:38:51 +0000
commitdf68d9d5bf5329bc2f7effb6afa1d3904eaf30d8 (patch)
tree351e7418e7b246e6355d733dda07997985862758 /include/media
parent13b6b51e6d9c399f0bfa55be4eecaf47b63845f2 (diff)
parent60b25aa0c173854593743dd85588c7449baf87c0 (diff)
downloadframeworks_av-df68d9d5bf5329bc2f7effb6afa1d3904eaf30d8.zip
frameworks_av-df68d9d5bf5329bc2f7effb6afa1d3904eaf30d8.tar.gz
frameworks_av-df68d9d5bf5329bc2f7effb6afa1d3904eaf30d8.tar.bz2
am 60b25aa0: am 9ab9c85e: Merge "MPEG4Extractor: ensure buffer size is not less than 8 for LastCommentData." into klp-dev
* commit '60b25aa0c173854593743dd85588c7449baf87c0': MPEG4Extractor: ensure buffer size is not less than 8 for LastCommentData.
Diffstat (limited to 'include/media')
0 files changed, 0 insertions, 0 deletions