summaryrefslogtreecommitdiffstats
path: root/media/libmedia
diff options
context:
space:
mode:
authorAbhishek Arya <aarya@google.com>2015-08-25 23:25:19 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-25 23:25:19 +0000
commitf67f894fead9065dcffda03a127cee7d746c9226 (patch)
treef511bdaa7cfeecebfa575d546a7deb59473fb7da /media/libmedia
parent529c5cbf4e3df3cf4a0d1feaba547d314d53c3d3 (diff)
parentff9a97f62344dc318b90c5b62ae3c7d3be5ab90e (diff)
downloadframeworks_av-f67f894fead9065dcffda03a127cee7d746c9226.zip
frameworks_av-f67f894fead9065dcffda03a127cee7d746c9226.tar.gz
frameworks_av-f67f894fead9065dcffda03a127cee7d746c9226.tar.bz2
am ff9a97f6: am 92aa0532: am 5e47eb95: am 35a7b54e: am f9a51893: (-s ours) am 9a2be5d4: Merge "DO NOT MERGE - Fix software video decoder buffer size calculation" into klp-dev
* commit 'ff9a97f62344dc318b90c5b62ae3c7d3be5ab90e': DO NOT MERGE - Fix software video decoder buffer size calculation
Diffstat (limited to 'media/libmedia')
0 files changed, 0 insertions, 0 deletions