tree 5f839feea7eba5fc65002a319de6d01ab2e592b5
parent 91052b1c78aaf57b0db28a0b1e4f7b91e5d8fda6
parent 5b969a5a518873c602225fb4c0430a0d6059c302
author Treehugger Robot <treehugger-gerrit@google.com> 1588113424 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1588113424 +0000

Merge "Add METADATA to mp4parser: Apache2+MIT=NOTICE" am: 5b969a5a51

Change-Id: I66b17ac7f93ea5686c5904ce8b1f8bf2f1baea50