tree 6dcd7de8a3e46a412650b19b201630444e9d98d8
parent 2545b2cabcb596ac65bbc4404f9afb2deec11288
parent 163b29f97f8642f45d0d06cfcde2d97db135c381
author Bob Badour <bbadour@google.com> 1613587735 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1613587735 +0000

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic9d9b5d981eb21ad2c76a7db821c5f9b5f9d6115