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

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

Change-Id: I946bcdd9a17e322d04acdb2944c853d6fb8acfb1