OSDN Git Service

resolved conflicts for merge of 8a064aa8 to klp-modular-dev
authorMarco Nelissen <marcone@google.com>
Thu, 20 Aug 2015 18:29:58 +0000 (11:29 -0700)
committerMarco Nelissen <marcone@google.com>
Thu, 20 Aug 2015 18:29:58 +0000 (11:29 -0700)
commiteb10ccbc9dcab8ec3ee22a1c2b2db4a673c6fdc2
treeae30f2a2cb0aa4aac6be286d42f30d6d97b32c79
parentd7c205fe1f7cda2cdcb3062b548c0777402bab38
parent8a064aa83ad590b61ddd84e678c59f0d1f68106c
resolved conflicts for merge of 8a064aa8 to klp-modular-dev

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