tree 4f756f2cdefece987680e3c1aaf1c770b2e3ac98
parent ee8abd6f6e44fcaf4edbbadf5d50234a04398bd5
parent ba4ce1eca931c7304734497d7f88d4b7fe85db68
author Bob Badour <bbadour@google.com> 1613517478 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1613517478 +0000

Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/chromium-trace" am: 5ec6622f80 am: 6b4e3060df am: db8b893118 am: ba4ce1eca9

Original change: https://android-review.googlesource.com/c/platform/external/chromium-trace/+/1588910

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I938fde74e8b76d63ca3646617a3ae8744f024b03