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

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1cacb0fcda5c59cf91f1165ead695a80fc1de91f