diff options
author | Bob Badour <bbadour@google.com> | 2021-02-05 23:17:04 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-05 23:17:04 +0000 |
commit | a301a787160f06157a2276dc1b32ffe7d65210f8 (patch) | |
tree | ef6e754701f052db4d354a169fb0de14fd8d1bd0 /import_scrypt.sh | |
parent | 73cfcf71ca2d00debde21c63edaf4fdb96e32143 (diff) | |
parent | c91d67126471be75259170daaf9930900222d610 (diff) | |
download | scrypt-a301a787160f06157a2276dc1b32ffe7d65210f8.tar.gz |
Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/scrypt" am: bad7e59471 am: 3d08789812 am: bef041db90 am: c91d671264android-mainline-12.0.0_r99android-mainline-12.0.0_r98android-mainline-12.0.0_r77android-mainline-12.0.0_r70android-mainline-12.0.0_r69android-mainline-12.0.0_r63android-mainline-12.0.0_r59android-mainline-12.0.0_r56android-mainline-12.0.0_r5android-mainline-12.0.0_r49android-mainline-12.0.0_r42android-mainline-12.0.0_r39android-mainline-12.0.0_r22android-mainline-12.0.0_r19android-mainline-12.0.0_r122android-mainline-12.0.0_r115android-mainline-12.0.0_r113android-mainline-12.0.0_r100aml_tz3_311312010android12-mainline-networkstack-releaseandroid12-mainline-art-release
Original change: https://android-review.googlesource.com/c/platform/external/scrypt/+/1576025
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ida48f48b5b976bab4eb06eb0d49d480eeab76d7e
Diffstat (limited to 'import_scrypt.sh')
0 files changed, 0 insertions, 0 deletions