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

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie38f559424ee32b2bdb548df184df33e882a2027