OSDN Git Service

Merge commit '2381f06f374ee0cb8bca0edf5388394432b00e6d' into HEAD
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 5 Dec 2013 20:38:14 +0000 (12:38 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 5 Dec 2013 20:38:14 +0000 (12:38 -0800)
commite2d617f5ba7fb90f27b03e2593666b2c927e4dc9
tree187992f0c2d4bc565ca24b34aa0ee78e359a3f68
parent92630351d265a61faae2dfe006a8bb330283aa7b
parent2381f06f374ee0cb8bca0edf5388394432b00e6d
Merge commit '2381f06f374ee0cb8bca0edf5388394432b00e6d' into HEAD
media/libstagefright/MPEG4Extractor.cpp