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

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I22c7dae19bda19cc957ec41176cf03731bfcf407