tree cbaf65481330ddfd93acd08775d131d239e59585
parent 0ef9b54e746cec45b0db0153aaf3f0442d4f7759
parent 2953cd429ff61ae6d814a262ed954f259893ff57
author Bob Badour <bbadour@google.com> 1613582542 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1613582542 +0000

Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/dexmaker" am: 15202c20e5 am: 0ba6eb260c am: 2953cd429f

Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/1588207

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifadf09f3b1d3126244bb31efb855132f27192874