summaryrefslogtreecommitdiffstats
path: root/media/libmedia
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2014-03-07 18:33:52 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-07 18:33:52 +0000
commit4106cdf1f951560271c154282f9a7671893787fb (patch)
tree3271c4ddf500cf6cf20caf2a73d6f9398e95dd2f /media/libmedia
parent9219bfc48ccfab892913e37eaa85921f7e9b2d51 (diff)
parent03729fbe43b0e36345463ef219d12a0d86daee90 (diff)
downloadframeworks_av-4106cdf1f951560271c154282f9a7671893787fb.zip
frameworks_av-4106cdf1f951560271c154282f9a7671893787fb.tar.gz
frameworks_av-4106cdf1f951560271c154282f9a7671893787fb.tar.bz2
am 03729fbe: am 5bc83fc3: Merge "Fix SIGABRT when playing mp4 file" into klp-dev
* commit '03729fbe43b0e36345463ef219d12a0d86daee90': Fix SIGABRT when playing mp4 file
Diffstat (limited to 'media/libmedia')
0 files changed, 0 insertions, 0 deletions