tree aa24bc870948beb87a8bfa746517da453f102b93
parent 3cb8e207706441aa8da5fc558d428c70fb9e259e
parent c69e5f8f89794d59ca14fc3ea646903c46ddd381
author Bob Badour <bbadour@google.com> 1613517440 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1613517440 +0000

Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/nist-pkits" am: 43a4e803e0 am: 1f075dd066 am: 853b978214 am: c69e5f8f89

Original change: https://android-review.googlesource.com/c/platform/external/nist-pkits/+/1588934

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4fba9fc4cb4d37311611066beae571c9f13fcffa