summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorWei Jia <wjia@google.com>2015-08-21 20:17:09 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-21 20:17:09 +0000
commit07a2e912a89d0dc83a8e83b33a066ef3ae1a2333 (patch)
tree78aea84412b7abd2190379a762a486d7f9bbf5b4 /media
parentbb64d2fb9e458c9bde66dbc79d88462b7db2b652 (diff)
parent323d22e76e2d96306c5f67edb07bb4c2eef14188 (diff)
downloadframeworks_av-07a2e912a89d0dc83a8e83b33a066ef3ae1a2333.zip
frameworks_av-07a2e912a89d0dc83a8e83b33a066ef3ae1a2333.tar.gz
frameworks_av-07a2e912a89d0dc83a8e83b33a066ef3ae1a2333.tar.bz2
am 323d22e7: am 8319fadb: am f814f84e: (-s ours) am d8816a13: DO NOT MERGE libstagefright: Fix crash in convertMetaDataToMessage
* commit '323d22e76e2d96306c5f67edb07bb4c2eef14188': DO NOT MERGE libstagefright: Fix crash in convertMetaDataToMessage
Diffstat (limited to 'media')
0 files changed, 0 insertions, 0 deletions