summaryrefslogtreecommitdiff
path: root/config.h
diff options
context:
space:
mode:
authorBob Badour <bbadour@google.com>2021-02-05 22:26:24 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-02-05 22:26:24 +0000
commitc91d67126471be75259170daaf9930900222d610 (patch)
treeef6e754701f052db4d354a169fb0de14fd8d1bd0 /config.h
parent73cfcf71ca2d00debde21c63edaf4fdb96e32143 (diff)
parentbef041db902120ad4ee469564b7780cff8b91d44 (diff)
downloadscrypt-android12-qpr3-s4-release.tar.gz
Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/scrypt" am: bad7e59471 am: 3d08789812 am: bef041db90android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-3android-s-v2-beta-2android-s-qpr3-beta-1android-mainline-12.0.0_r4android-mainline-12.0.0_r36android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-releaseandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devandroid12--mainline-releaseandroid-t-preview-1android-s-v2-preview-1android-s-v2-beta-3android-s-qpr3-beta-1
Original change: https://android-review.googlesource.com/c/platform/external/scrypt/+/1576025 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If1f1486b311d2ae97c5418ae46dbed4da91a1573
Diffstat (limited to 'config.h')
0 files changed, 0 insertions, 0 deletions