tree ef6e754701f052db4d354a169fb0de14fd8d1bd0
parent 73cfcf71ca2d00debde21c63edaf4fdb96e32143
parent bef041db902120ad4ee469564b7780cff8b91d44
author Bob Badour <bbadour@google.com> 1612563984 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1612563984 +0000

Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/scrypt" am: bad7e59471 am: 3d08789812 am: bef041db90

Original change: https://android-review.googlesource.com/c/platform/external/scrypt/+/1576025

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If1f1486b311d2ae97c5418ae46dbed4da91a1573