tree 37ba896f7fc2bf66bc24ea009cb7a7a2878f4735
parent e7bddd04e36ca3dde532bfebfb3896a30cb31dd1
parent b32a92aec5bb05ad55711327cb124d532104203c
author Bob Badour <bbadour@google.com> 1613585475 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1613585475 +0000

Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/nist-sip" am: 78e5c65d03 am: 16da2551d4 am: 98be8f1dd6 am: b32a92aec5

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I389da1cd1e030230069bd014b3940f6736a1423d