commit | 5436cd2d2b0b500c6bebc13102e8f75f347224ab | [log] [tgz] |
---|---|---|
author | Tobias Thierer <tobiast@google.com> | Thu Apr 11 05:30:41 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Thu Apr 11 05:30:41 2019 -0700 |
tree | 4f51b79d9caa8e5b4c332cfe649e7d7c78b1f5cd | |
parent | 403f845ffd7b3b57d080f63667508cf8a4b71a31 [diff] | |
parent | 7543c2211f54dab008642778666c2f36ec3b8355 [diff] |
Merge "add .m2ts to video/mp2ts mimetype for Android" am: 8414aee176 am: 7543c2211f Change-Id: I093c5b7b666817ad95f3a875ac7a48da1653d640