tree 6dcd7de8a3e46a412650b19b201630444e9d98d8
parent ca3a1377703495160ded12131b66ed37e3d792e8
parent ba90bc32b5b4119aee38d39da36493fc2eafed27
author Bob Badour <bbadour@google.com> 1613593861 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1613593861 +0000

Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/jdiff" am: 75558173f8 am: 163b29f97f am: b03edc3e2b am: ba90bc32b5

Original change: https://android-review.googlesource.com/c/platform/external/jdiff/+/1588800

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia6287bfd69b07564f756104095766b0a8ad4641f