OSDN Git Service

Merge commit '91820d46b5f3065c2fded3cdf65d305715b33bb1' into HEAD
authorBill Yi <byi@google.com>
Tue, 29 Apr 2014 18:34:16 +0000 (11:34 -0700)
committerBill Yi <byi@google.com>
Tue, 29 Apr 2014 18:34:16 +0000 (11:34 -0700)
commit1a7be1ec9c769203e6c8e26378de0ab8e2ad493d
tree68773b199cc4adcb96124270863244477570c78e
parentf131f87369ec06fc27fc1f14ea72f0ca1a066509
parent91820d46b5f3065c2fded3cdf65d305715b33bb1
Merge commit '91820d46b5f3065c2fded3cdf65d305715b33bb1' into HEAD
media/libstagefright/ACodec.cpp
media/libstagefright/MPEG4Writer.cpp
media/libstagefright/OMXCodec.cpp
media/libstagefright/httplive/LiveSession.cpp
media/libstagefright/httplive/M3UParser.cpp
media/libstagefright/httplive/PlaylistFetcher.cpp
media/libstagefright/matroska/MatroskaExtractor.cpp
media/libstagefright/mpeg2ts/AnotherPacketSource.cpp
media/libstagefright/omx/GraphicBufferSource.cpp
media/libstagefright/omx/OMXNodeInstance.cpp
services/audioflinger/Tracks.cpp