tree 9172b09d71a2a30fb1c48861403df4f5cda5cec6
parent 00e6fe8fab66d976a9698f634e7724487a810d09
parent 122f05dc2e363754f7cf06c4eac6bf5b3f3cbc8d
author Bob Badour <bbadour@google.com> 1613511954 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1613511954 +0000

Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/mp4parser" am: 122f05dc2e

Original change: https://android-review.googlesource.com/c/platform/external/mp4parser/+/1588913

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I82fa562205e97e14ffe2ff7ce24f603f63ea8a64