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

Merge "Add METADATA to mp4parser: Apache2+MIT=NOTICE" am: 5b969a5a51 am: 47c6ee108c am: cdf4cf5c8e am: fcd99badc4

Change-Id: If7fa84ac75055b9765deca4123480176f1b2c7b0