summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLajos Molnar <lajos@google.com>2014-03-07 02:41:38 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-07 02:41:38 +0000
commitd1d45fe7779e10e381420c63de79001c8593423b (patch)
tree018c61e337c0bf7a1d21b2ee834fa601227fc6bc /include
parent414c2371ab38a9826dca2506c9cefd703af05c2b (diff)
parentd7c4da3c1c33b5219d7d87ba698cd7d9c8750c41 (diff)
downloadframeworks_av-d1d45fe7779e10e381420c63de79001c8593423b.zip
frameworks_av-d1d45fe7779e10e381420c63de79001c8593423b.tar.gz
frameworks_av-d1d45fe7779e10e381420c63de79001c8593423b.tar.bz2
am d7c4da3c: am 909498b7: Merge "stagefright: use CODECS field in EXT-X_STREAM-INF as fallback" into klp-dev
* commit 'd7c4da3c1c33b5219d7d87ba698cd7d9c8750c41': stagefright: use CODECS field in EXT-X_STREAM-INF as fallback
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions