tree 9172b09d71a2a30fb1c48861403df4f5cda5cec6
parent 041bdf15f1b016b6cce6d65bb1e46a60ae8f8afd
parent b06835d331e04a3808958fd9f8959cf2929ff5ec
author Bob Badour <bbadour@google.com> 1613516543 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1613516543 +0000

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I42a71b47c1c9a56c9c14642adb8738a0371b366e