commit | 3e5de385d17aa0fec12f198d157397ed8e39a9aa | [log] [tgz] |
---|---|---|
author | Wei Jia <wjia@google.com> | Tue Oct 11 01:45:00 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Oct 11 01:45:00 2016 +0000 |
tree | c07b643aae56b2398a3bb38bb7474fdb12990781 | |
parent | ea07b85ee0f16ff6ea4f53d375d3e95ef010c8ed [diff] | |
parent | 1ae49034fc367e4b2d11006e9cdcd2cf749de45f [diff] |
Merge "MPEG4Extractor: set mime type of fileMetaData correctly." into nyc-mr1-dev am: 6657f7baa8 am: 0572267d21 am: 1ae49034fc Change-Id: I8569dbe5ec2bcbe254477278f8839ddad7796b9d