diff options
author | Bob Badour <bbadour@google.com> | 2021-02-16 23:17:56 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-16 23:17:56 +0000 |
commit | 9f291a4ce0bee3c1db145996a5dae1ff4a247acf (patch) | |
tree | 9172b09d71a2a30fb1c48861403df4f5cda5cec6 /isoparser/src/main/java/com | |
parent | 041bdf15f1b016b6cce6d65bb1e46a60ae8f8afd (diff) | |
parent | 4b0b0b41f3347c3a8f4dd703e7fdacb201e47576 (diff) | |
download | mp4parser-9f291a4ce0bee3c1db145996a5dae1ff4a247acf.tar.gz |
Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/mp4parser" am: 122f05dc2e am: e1c3e39227 am: b06835d331 am: 4b0b0b41f3android-mainline-12.0.0_r99android-mainline-12.0.0_r98android-mainline-12.0.0_r77android-mainline-12.0.0_r70android-mainline-12.0.0_r69android-mainline-12.0.0_r63android-mainline-12.0.0_r59android-mainline-12.0.0_r56android-mainline-12.0.0_r5android-mainline-12.0.0_r49android-mainline-12.0.0_r42android-mainline-12.0.0_r39android-mainline-12.0.0_r22android-mainline-12.0.0_r19android-mainline-12.0.0_r122android-mainline-12.0.0_r115android-mainline-12.0.0_r113android-mainline-12.0.0_r100aml_tz3_311312010android12-mainline-networkstack-releaseandroid12-mainline-art-release
Original change: https://android-review.googlesource.com/c/platform/external/mp4parser/+/1588913
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I747eff512062b2d4055b3f56f326b2bcea04d7b6
Diffstat (limited to 'isoparser/src/main/java/com')
0 files changed, 0 insertions, 0 deletions