summaryrefslogtreecommitdiffstats
path: root/media/libmedia/MediaCodecInfo.cpp
diff options
context:
space:
mode:
authorChong Zhang <chz@google.com>2014-08-14 21:17:50 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-08-14 19:49:28 +0000
commit261562316c1b652ea697c99c0f24a54112bd0385 (patch)
tree3317a4805ddb234ecc196ca3fcc574fb4783a8e4 /media/libmedia/MediaCodecInfo.cpp
parent44a5a202101614302f607228d4357496b350bab4 (diff)
parent7b3cd1f33dcfc0b6034144cf48c0919cf7ca6046 (diff)
downloadframeworks_av-261562316c1b652ea697c99c0f24a54112bd0385.zip
frameworks_av-261562316c1b652ea697c99c0f24a54112bd0385.tar.gz
frameworks_av-261562316c1b652ea697c99c0f24a54112bd0385.tar.bz2
Merge "make NuPlayer's http connection mechanism behave more like that of AwesomePlayer's" into lmp-dev
Diffstat (limited to 'media/libmedia/MediaCodecInfo.cpp')
0 files changed, 0 insertions, 0 deletions