OSDN Git Service

resolved conflicts for merge of 1f44d837 to lmp-dev
authorWei Jia <wjia@google.com>
Sat, 6 Jun 2015 00:43:52 +0000 (17:43 -0700)
committerWei Jia <wjia@google.com>
Sat, 6 Jun 2015 00:43:52 +0000 (17:43 -0700)
commit115e995c6b3fe7ed33e2d5d88872cb87ab4e63f0
tree72ae084b486e49065520332b3a43ff4c3a3f75ef
parent768a8fb4c05f524c802f8e97c9e07b73d1a196ff
parent1f44d837a9273dc86bf0c928c2ead313d71d1464
resolved conflicts for merge of 1f44d837 to lmp-dev

Change-Id: Id60c2470ec2afebdbc1c0c995b90e294c9c879eb
media/libstagefright/MPEG4Extractor.cpp