OSDN Git Service

resolved conflicts for merge of 07bacabe to master
authorAndreas Huber <andih@google.com>
Mon, 5 Dec 2011 21:30:52 +0000 (13:30 -0800)
committerAndreas Huber <andih@google.com>
Mon, 5 Dec 2011 21:31:17 +0000 (13:31 -0800)
commit456caf3f5f0af673dc120c17c23635f40d8f5ac2
tree0c7007b18f37e2311147e34b44189ebf487c6991
parent2158db000d227875b12c85c850ec6e3039553f9b
parent1a733a33e1428f577747fcd74dccd8853bd1b29f
resolved conflicts for merge of 07bacabe to master

Change-Id: Idb56996f7c1b78d96e3d3d3f08419c4d122db0b1
media/libstagefright/AwesomePlayer.cpp
media/libstagefright/MPEG4Extractor.cpp