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

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iecdf1d5f3c539d42cb0ef8a98e7e3b3e98f880cf