OSDN Git Service

resolved conflicts for merge of 0b3eca88 to jb-mr1-dev-plus-aosp
authorNick Kralevich <nnk@google.com>
Fri, 7 Aug 2015 15:50:46 +0000 (08:50 -0700)
committerNick Kralevich <nnk@google.com>
Fri, 7 Aug 2015 15:54:38 +0000 (08:54 -0700)
commit430475da7f0edb86ee6a85378d1583ab07f7f93d
treed8deb8245d7fb3517c90679a3166b2ba37417a71
parent7af634e131361862d2e47fb344278e31ed05be4f
parent0b3eca88899a12b8d5496f67df2f472ac9bdd0ed
resolved conflicts for merge of 0b3eca88 to jb-mr1-dev-plus-aosp

Bug: 20923261
Change-Id: I6fe12a7c5768f77454bd0391b07f4c3181607d14
media/libstagefright/MPEG4Extractor.cpp