summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/matroska
diff options
context:
space:
mode:
authorBrian Carlstrom <bdc@google.com>2014-01-31 16:26:41 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-01-31 16:26:41 +0000
commitcc09c59e487bbd5f76cb0212ceb3bafd88d1fa15 (patch)
tree1953d849c9450f68d12d8b4177f013378ccf5324 /media/libstagefright/matroska
parent5ce88270eb2d41462de8c4155673b802b2ca48cb (diff)
parent06cb26baa486b28afabdd3baee58c317a5cbb28b (diff)
downloadframeworks_av-cc09c59e487bbd5f76cb0212ceb3bafd88d1fa15.zip
frameworks_av-cc09c59e487bbd5f76cb0212ceb3bafd88d1fa15.tar.gz
frameworks_av-cc09c59e487bbd5f76cb0212ceb3bafd88d1fa15.tar.bz2
am 06cb26ba: am 60181e36: Merge "frameworks/av: Rename persist.sys.dalvik.vm.lib to allow new default"
* commit '06cb26baa486b28afabdd3baee58c317a5cbb28b': frameworks/av: Rename persist.sys.dalvik.vm.lib to allow new default
Diffstat (limited to 'media/libstagefright/matroska')
0 files changed, 0 insertions, 0 deletions