OSDN Git Service

am 510180f1: am 08e42967: Merge "Add support for retrieving location information...
authorJames Dong <jdong@google.com>
Fri, 11 Nov 2011 15:34:21 +0000 (15:34 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 11 Nov 2011 15:34:21 +0000 (15:34 +0000)
commit023132eac2f2e2e0aa8859231cce1a6d324242fd
tree157565f7f422b42fe15cd23118079a70dd528ab1
parent0bb80204f457e1f948e47abacd86fae9ee687de4
parentcb432e65fd876b8b210f548c07b230517450b3b9
am 510180f1: am 08e42967: Merge "Add support for retrieving location information in mp4/3gpp files" into ics-mr1

* commit '510180f162dee3ae5416a98caa07f58a754f4b3f':
  Add support for retrieving location information in mp4/3gpp files
media/libstagefright/MPEG4Extractor.cpp
media/libstagefright/StagefrightMetadataRetriever.cpp