aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-06-21Support compiling ms-tpm-20-ref targets for Mac OS X am: e4c9cc2ddd am: ↵HEADandroid-14.0.0_r37android-14.0.0_r36android-14.0.0_r35android-14.0.0_r34android-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29mastermainandroid14-qpr2-s5-releaseandroid14-qpr2-s4-releaseandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-releaseA. Cody Schuffelen
938173f0be am: 2c6183e4d4 am: ba0a34c287 am: 692d7d15b3 am: fb586c8717 Original change: https://android-review.googlesource.com/c/platform/external/ms-tpm-20-ref/+/2628523 Change-Id: Ifdab1f82a22ae0dac5adf0bd477e4497b0f5954d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21Support compiling ms-tpm-20-ref targets for Mac OS X am: e4c9cc2ddd am: ↵A. Cody Schuffelen
938173f0be am: 2c6183e4d4 am: ba0a34c287 am: 692d7d15b3 Original change: https://android-review.googlesource.com/c/platform/external/ms-tpm-20-ref/+/2628523 Change-Id: Iffd7b88dd818570479ddcfc07bf843c1d0a5c941 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21Support compiling ms-tpm-20-ref targets for Mac OS X am: e4c9cc2ddd am: ↵A. Cody Schuffelen
938173f0be am: 2c6183e4d4 am: ba0a34c287 Original change: https://android-review.googlesource.com/c/platform/external/ms-tpm-20-ref/+/2628523 Change-Id: I167a9a62c832f2bf9732b3568510e0ee040aaca5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21Support compiling ms-tpm-20-ref targets for Mac OS X am: e4c9cc2ddd am: ↵A. Cody Schuffelen
938173f0be am: 2c6183e4d4 Original change: https://android-review.googlesource.com/c/platform/external/ms-tpm-20-ref/+/2628523 Change-Id: If4f23da8774f58713621de095657652249ff1609 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21Support compiling ms-tpm-20-ref targets for Mac OS X am: e4c9cc2ddd am: ↵A. Cody Schuffelen
938173f0be Original change: https://android-review.googlesource.com/c/platform/external/ms-tpm-20-ref/+/2628523 Change-Id: I4c57bc9c2838793e5b6b803a5833fec533af1862 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21Support compiling ms-tpm-20-ref targets for Mac OS X am: e4c9cc2dddA. Cody Schuffelen
Original change: https://android-review.googlesource.com/c/platform/external/ms-tpm-20-ref/+/2628523 Change-Id: Iff44b3f1e01167b6f29b1c398f218b473956a093 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15Support compiling ms-tpm-20-ref targets for Mac OS XA. Cody Schuffelen
Bug: 287544073 Test: m ms-tpm-20-ref Change-Id: Ibd39eb20b324c417ef6a930cdc6874f78f8a36a9
2023-03-15Enable Windows host compilation of ms-tpm-20-ref am: 35da877479 am: ↵Oystein Eftevaag
83113fc5db am: 08ea96e8fe am: 55fc576843 am: f842edd633 Original change: https://android-review.googlesource.com/c/platform/external/ms-tpm-20-ref/+/2411454 Change-Id: I5b934a2f71ec5e7e3634d0835c6b4c16da4d5759 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15Enable Windows host compilation of ms-tpm-20-ref am: 35da877479 am: ↵Oystein Eftevaag
83113fc5db am: 08ea96e8fe am: 55fc576843 am: b3a3aa4b54 Original change: https://android-review.googlesource.com/c/platform/external/ms-tpm-20-ref/+/2411454 Change-Id: Id55d28144137a6c97f5134c6de3cce8ddfcefdd2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15Enable Windows host compilation of ms-tpm-20-ref am: 35da877479 am: ↵android-14.0.0_r45android-14.0.0_r44android-14.0.0_r43android-14.0.0_r42android-14.0.0_r41android-14.0.0_r40android-14.0.0_r39android-14.0.0_r38android-14.0.0_r27android-14.0.0_r26android-14.0.0_r25android-14.0.0_r24android-14.0.0_r23android-14.0.0_r22android-14.0.0_r21android-14.0.0_r20android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16android14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-d2-s5-releaseandroid14-d2-s4-releaseandroid14-d2-s3-releaseandroid14-d2-s2-releaseandroid14-d2-s1-releaseandroid14-d2-releaseOystein Eftevaag
83113fc5db am: 08ea96e8fe am: 55fc576843 Original change: https://android-review.googlesource.com/c/platform/external/ms-tpm-20-ref/+/2411454 Change-Id: I7b6d72af132a84c11931a9012273b79a32361ca5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15Enable Windows host compilation of ms-tpm-20-ref am: 35da877479 am: ↵Oystein Eftevaag
83113fc5db am: 08ea96e8fe am: 55fc576843 Original change: https://android-review.googlesource.com/c/platform/external/ms-tpm-20-ref/+/2411454 Change-Id: Icdc800e71797095093f14549f7423c08553b552a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15Enable Windows host compilation of ms-tpm-20-ref am: 35da877479 am: ↵android14-devOystein Eftevaag
83113fc5db am: 08ea96e8fe Original change: https://android-review.googlesource.com/c/platform/external/ms-tpm-20-ref/+/2411454 Change-Id: I2a44bfbc385c0d60fed41799843efbfce8a403d7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15Enable Windows host compilation of ms-tpm-20-ref am: 35da877479 am: 83113fc5dbOystein Eftevaag
Original change: https://android-review.googlesource.com/c/platform/external/ms-tpm-20-ref/+/2411454 Change-Id: I027f58d064e0d229ab5f082139fd8da9cd58238c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15Enable Windows host compilation of ms-tpm-20-ref am: 35da877479Oystein Eftevaag
Original change: https://android-review.googlesource.com/c/platform/external/ms-tpm-20-ref/+/2411454 Change-Id: Ib9ee5c583539093221f4e555528c7aec8a36429d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-08Enable Windows host compilation of ms-tpm-20-refandroid-u-beta-1-gplOystein Eftevaag
Bug: 261908998 Test: gflags builds with MinGW Change-Id: I292ce2c0d654f8c1d30275e14d94d5972a1c51c1
2022-03-08Merge "Add license_note" am: 1032182dd6 am: 91e293d879 am: c1d3310168 am: ↵Treehugger Robot
fe01fcf04b am: b53a8e745f Original change: https://android-review.googlesource.com/c/platform/external/ms-tpm-20-ref/+/2012160 Change-Id: I1c3af6d9bfb8228bbbff8a69aa7859267f6e7010
2022-03-08Merge "Add license_note" am: 1032182dd6 am: 91e293d879 am: c1d3310168 am: ↵Treehugger Robot
fe01fcf04b Original change: https://android-review.googlesource.com/c/platform/external/ms-tpm-20-ref/+/2012160 Change-Id: I6e7d89d3276289676a2e9ae4b7b8a452dbb7d36c
2022-03-08Merge "Add license_note" am: 1032182dd6 am: 91e293d879 am: c1d3310168 am: ↵aml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_331910000aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000aml_ase_331311020aml_ase_331112000aml_ase_331011020android13-mainline-tzdata4-releaseandroid13-mainline-appsearch-releaseaml_tz4_332714010Treehugger Robot
fe01fcf04b Original change: https://android-review.googlesource.com/c/platform/external/ms-tpm-20-ref/+/2012160 Change-Id: Ib12291a981e4f4a3f1ae3db3bc89260a7a9e0d5d
2022-03-08Merge "Add license_note" am: 1032182dd6 am: 91e293d879 am: c1d3310168t_frc_odp_330442040t_frc_odp_330442000t_frc_ase_330444010android-13.0.0_r83android-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r79android-13.0.0_r78android-13.0.0_r77android-13.0.0_r76android-13.0.0_r75android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r71android-13.0.0_r70android-13.0.0_r69android-13.0.0_r68android-13.0.0_r67android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r63android-13.0.0_r62android-13.0.0_r61android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android-13.0.0_r57android-13.0.0_r56android-13.0.0_r54android-13.0.0_r53android-13.0.0_r52android-13.0.0_r51android-13.0.0_r50android-13.0.0_r49android-13.0.0_r48android-13.0.0_r47android-13.0.0_r46android-13.0.0_r45android-13.0.0_r44android-13.0.0_r43android-13.0.0_r42android-13.0.0_r41android-13.0.0_r40android-13.0.0_r39android-13.0.0_r38android-13.0.0_r37android-13.0.0_r36android-13.0.0_r35android-13.0.0_r34android-13.0.0_r33android-13.0.0_r32aml_go_odp_330912000aml_go_ads_330915100aml_go_ads_330915000aml_go_ads_330913000main-16k-with-phonesmain-16kandroid13-qpr3-s9-releaseandroid13-qpr3-s8-releaseandroid13-qpr3-s7-releaseandroid13-qpr3-s6-releaseandroid13-qpr3-s5-releaseandroid13-qpr3-s4-releaseandroid13-qpr3-s3-releaseandroid13-qpr3-s2-releaseandroid13-qpr3-s14-releaseandroid13-qpr3-s13-releaseandroid13-qpr3-s12-releaseandroid13-qpr3-s11-releaseandroid13-qpr3-s10-releaseandroid13-qpr3-s1-releaseandroid13-qpr3-releaseandroid13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseandroid13-qpr2-s9-releaseandroid13-qpr2-s8-releaseandroid13-qpr2-s7-releaseandroid13-qpr2-s6-releaseandroid13-qpr2-s5-releaseandroid13-qpr2-s3-releaseandroid13-qpr2-s2-releaseandroid13-qpr2-s12-releaseandroid13-qpr2-s11-releaseandroid13-qpr2-s10-releaseandroid13-qpr2-s1-releaseandroid13-qpr2-releaseandroid13-qpr2-b-s1-releaseandroid13-mainline-go-adservices-releaseandroid13-frc-odp-releaseandroid13-devandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseandroid13-d3-s1-releaseTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/ms-tpm-20-ref/+/2012160 Change-Id: Id6daed906258f925873fb2760a124fa54ab03327
2022-03-08Merge "Add license_note" am: 1032182dd6 am: 91e293d879Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/ms-tpm-20-ref/+/2012160 Change-Id: I67fb95f0e21b6f51d4433605709f7996a8b958d0
2022-03-08Merge "Add license_note" am: 1032182dd6Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/ms-tpm-20-ref/+/2012160 Change-Id: Ie6cb4ec1f276f129f3f48ef8182e9cc6fbaf54c5
2022-03-08Merge "Add license_note"Treehugger Robot
2022-03-07Add license_noteBob Badour
Comments not preserved during refresh. Bug: 68860345 Test: m nothing Change-Id: Ibc6e65d959ecc09a2bd1e6adaf013a02286a6471
2021-09-18Remove external/ms-tpm-20-ref/.gitmodules and submodule directories am: ↵Raman Tenneti
5d68d01a1a am: fac045177b am: ef87020c15 am: 3b84342fbf am: d45b3fbbca Original change: https://android-review.googlesource.com/c/platform/external/ms-tpm-20-ref/+/1830606 Change-Id: I90e4f6e31e2f40e97c532e5c48956e974f0c810c
2021-09-18Remove external/ms-tpm-20-ref/.gitmodules and submodule directories am: ↵Raman Tenneti
5d68d01a1a am: fac045177b am: ef87020c15 am: 3b84342fbf Original change: https://android-review.googlesource.com/c/platform/external/ms-tpm-20-ref/+/1830606 Change-Id: I43f2db345a395c49e94091cbd0e75bda7adc7179
2021-09-18Remove external/ms-tpm-20-ref/.gitmodules and submodule directories am: ↵android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-beta-3android-s-qpr3-beta-1android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Raman Tenneti
5d68d01a1a am: fac045177b am: ef87020c15 Original change: https://android-review.googlesource.com/c/platform/external/ms-tpm-20-ref/+/1830606 Change-Id: If48fad75eb49e986d837025a8624467c3894efde
2021-09-18Remove external/ms-tpm-20-ref/.gitmodules and submodule directories am: ↵Raman Tenneti
5d68d01a1a am: fac045177b Original change: https://android-review.googlesource.com/c/platform/external/ms-tpm-20-ref/+/1830606 Change-Id: I8ba22c3d4f7a703fb2c4e6bb27d08c590d9165a7
2021-09-18Remove external/ms-tpm-20-ref/.gitmodules and submodule directories am: ↵android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-s-v2-preview-1Raman Tenneti
5d68d01a1a Original change: https://android-review.googlesource.com/c/platform/external/ms-tpm-20-ref/+/1830606 Change-Id: I9ef3849b42579b1cc9982aa29625610bbffd2473
2021-09-17Remove external/ms-tpm-20-ref/.gitmodules and submodule directoriesRaman Tenneti
git doesn't support submodules in external directory. Bug: 152899985 Test: Presubmit-Verify Change-Id: I64f01bedf5477e2f8657b9c7b2944d6f7a264cc5
2021-08-31Don't use the debug RNG in the TPM sim am: 39b8cf373a am: 7066fa24bd am: ↵Seth Moore
0cf2bc2e0c am: 436e3c3e9f am: c819172bbb Original change: https://android-review.googlesource.com/c/platform/external/ms-tpm-20-ref/+/1813623 Change-Id: Ic6a41f759f3f576a510aaf7f848c6684b3486127
2021-08-31Don't use the debug RNG in the TPM sim am: 39b8cf373a am: 7066fa24bd am: ↵Seth Moore
0cf2bc2e0c am: 436e3c3e9f Original change: https://android-review.googlesource.com/c/platform/external/ms-tpm-20-ref/+/1813623 Change-Id: Ia0f6b16eec8e7a495260b071165458a13778d21a
2021-08-31Don't use the debug RNG in the TPM sim am: 39b8cf373a am: 7066fa24bd am: ↵Seth Moore
0cf2bc2e0c Original change: https://android-review.googlesource.com/c/platform/external/ms-tpm-20-ref/+/1813623 Change-Id: Ic6da4276affa83d6edc36eb0a0154b71226e857f
2021-08-31Don't use the debug RNG in the TPM sim am: 39b8cf373a am: 7066fa24bdSeth Moore
Original change: https://android-review.googlesource.com/c/platform/external/ms-tpm-20-ref/+/1813623 Change-Id: I09dc4cd86f014bc8385915fca37fec371d1c59fc
2021-08-31Don't use the debug RNG in the TPM sim am: 39b8cf373aSeth Moore
Original change: https://android-review.googlesource.com/c/platform/external/ms-tpm-20-ref/+/1813623 Change-Id: I9538c347f50b4be856a6a444337a3c7b13591fa5
2021-08-30Don't use the debug RNG in the TPM simandroid-s-beta-5android-s-beta-5Seth Moore
The debug RNG doesn't seed the DRBG internally with any entropy, so every instance gets the same random bit sequence. Turning this off enables entropy gathering so that the DRBG is uniquely seeded per instance of the TPM simulator. Test: built cuttlefish and debugged, observing proper seeding Change-Id: Ia650b3c27bc3b94e7535c777aafb3b1b72238796
2021-06-02Merge sc-mainline-prodXin Li
Bug: 189946434 Change-Id: I023339cdcf0d69dfca57c0872e94d2043802718d
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 9ad1b23534 -s ↵android-mainline-12.0.0_r99android-mainline-12.0.0_r98android-mainline-12.0.0_r97android-mainline-12.0.0_r96android-mainline-12.0.0_r95android-mainline-12.0.0_r94android-mainline-12.0.0_r93android-mainline-12.0.0_r92android-mainline-12.0.0_r91android-mainline-12.0.0_r90android-mainline-12.0.0_r9android-mainline-12.0.0_r89android-mainline-12.0.0_r88android-mainline-12.0.0_r87android-mainline-12.0.0_r86android-mainline-12.0.0_r85android-mainline-12.0.0_r84android-mainline-12.0.0_r83android-mainline-12.0.0_r82android-mainline-12.0.0_r81android-mainline-12.0.0_r80android-mainline-12.0.0_r8android-mainline-12.0.0_r79android-mainline-12.0.0_r78android-mainline-12.0.0_r77android-mainline-12.0.0_r76android-mainline-12.0.0_r75android-mainline-12.0.0_r74android-mainline-12.0.0_r73android-mainline-12.0.0_r72android-mainline-12.0.0_r71android-mainline-12.0.0_r70android-mainline-12.0.0_r7android-mainline-12.0.0_r69android-mainline-12.0.0_r68android-mainline-12.0.0_r67android-mainline-12.0.0_r66android-mainline-12.0.0_r65android-mainline-12.0.0_r64android-mainline-12.0.0_r63android-mainline-12.0.0_r62android-mainline-12.0.0_r61android-mainline-12.0.0_r60android-mainline-12.0.0_r6android-mainline-12.0.0_r59android-mainline-12.0.0_r58android-mainline-12.0.0_r57android-mainline-12.0.0_r56android-mainline-12.0.0_r53android-mainline-12.0.0_r52android-mainline-12.0.0_r51android-mainline-12.0.0_r50android-mainline-12.0.0_r5android-mainline-12.0.0_r49android-mainline-12.0.0_r48android-mainline-12.0.0_r47android-mainline-12.0.0_r46android-mainline-12.0.0_r45android-mainline-12.0.0_r44android-mainline-12.0.0_r43android-mainline-12.0.0_r42android-mainline-12.0.0_r41android-mainline-12.0.0_r40android-mainline-12.0.0_r39android-mainline-12.0.0_r38android-mainline-12.0.0_r37android-mainline-12.0.0_r35android-mainline-12.0.0_r34android-mainline-12.0.0_r33android-mainline-12.0.0_r32android-mainline-12.0.0_r31android-mainline-12.0.0_r30android-mainline-12.0.0_r3android-mainline-12.0.0_r29android-mainline-12.0.0_r28android-mainline-12.0.0_r27android-mainline-12.0.0_r26android-mainline-12.0.0_r25android-mainline-12.0.0_r24android-mainline-12.0.0_r23android-mainline-12.0.0_r22android-mainline-12.0.0_r21android-mainline-12.0.0_r20android-mainline-12.0.0_r2android-mainline-12.0.0_r19android-mainline-12.0.0_r18android-mainline-12.0.0_r17android-mainline-12.0.0_r16android-mainline-12.0.0_r15android-mainline-12.0.0_r14android-mainline-12.0.0_r13android-mainline-12.0.0_r126android-mainline-12.0.0_r125android-mainline-12.0.0_r124android-mainline-12.0.0_r123android-mainline-12.0.0_r122android-mainline-12.0.0_r121android-mainline-12.0.0_r120android-mainline-12.0.0_r12android-mainline-12.0.0_r119android-mainline-12.0.0_r118android-mainline-12.0.0_r117android-mainline-12.0.0_r116android-mainline-12.0.0_r115android-mainline-12.0.0_r114android-mainline-12.0.0_r113android-mainline-12.0.0_r110android-mainline-12.0.0_r11android-mainline-12.0.0_r109android-mainline-12.0.0_r108android-mainline-12.0.0_r107android-mainline-12.0.0_r106android-mainline-12.0.0_r105android-mainline-12.0.0_r104android-mainline-12.0.0_r103android-mainline-12.0.0_r102android-mainline-12.0.0_r101android-mainline-12.0.0_r100android-mainline-12.0.0_r10android-mainline-12.0.0_r1aml_wif_311811030aml_tz3_311312010aml_tet_311811050aml_sdk_311710000aml_pco_311011000aml_mpr_311911090aml_doc_310851020android12-mainline-wifi-releaseandroid12-mainline-tethering-releaseandroid12-mainline-statsd-releaseandroid12-mainline-sdkext-releaseandroid12-mainline-resolv-releaseandroid12-mainline-permission-releaseandroid12-mainline-neuralnetworks-releaseandroid12-mainline-networkstack-releaseandroid12-mainline-mediaprovider-releaseandroid12-mainline-media-swcodec-releaseandroid12-mainline-media-releaseandroid12-mainline-ipsec-releaseandroid12-mainline-extservices-releaseandroid12-mainline-documentsui-releaseandroid12-mainline-conscrypt-releaseandroid12-mainline-cellbroadcast-releaseandroid12-mainline-captiveportallogin-releaseandroid12-mainline-art-releaseandroid12-mainline-adbd-releaseXin Li
ours am: cf5873ee2d -s ours am: ee9bb94118 -s ours am skip reason: Change-Id If12fedb292595905e342f1058e8f55020a1dcf9f with SHA-1 f81f03e331 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I6691215340d8060ffa9d8dbe4f4ea5888e3b5e31
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 9ad1b23534 -s ↵Xin Li
ours am: cf5873ee2d -s ours am: ee9bb94118 -s ours am skip reason: Change-Id If12fedb292595905e342f1058e8f55020a1dcf9f with SHA-1 f81f03e331 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I641538b7223b6463c1e9cfe39c1a40c90c72c183
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 9ad1b23534 -s ↵android-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-releaseXin Li
ours am: cf5873ee2d -s ours am skip reason: Change-Id If12fedb292595905e342f1058e8f55020a1dcf9f with SHA-1 f81f03e331 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I2cfbf3b46d83b37cddb95cdb7e3d5f20d7f31afd
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 9ad1b23534 -s oursXin Li
am skip reason: Change-Id If12fedb292595905e342f1058e8f55020a1dcf9f with SHA-1 f81f03e331 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib029d82e0f5f2aedc9995750707d903c0078bba1
2021-02-20Mark ab/7061308 as merged in stage.android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1android-s-beta-4Xin Li
Bug: 180401296 Merged-In: If12fedb292595905e342f1058e8f55020a1dcf9f Change-Id: Id9deb55c6674fc4c2a7cb8380665bbfa8524f21b
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/ms-tpm-20-ref am: c3fcf27be9 am: ↵Bob Badour
d9cf4ed1df am: 1eeac243cd am: abbd35318f Original change: https://android-review.googlesource.com/c/platform/external/ms-tpm-20-ref/+/1588810 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie41a9bc6f04bcd811d930855f9a496e3052c2e96
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/ms-tpm-20-ref am: c3fcf27be9 am: ↵Bob Badour
d9cf4ed1df am: 1eeac243cd am: abbd35318f Original change: https://android-review.googlesource.com/c/platform/external/ms-tpm-20-ref/+/1588810 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I298e8718f29639fee714bbbe235bceb56d497a1a
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/ms-tpm-20-ref am: c3fcf27be9 am: ↵Bob Badour
d9cf4ed1df am: 1eeac243cd Original change: https://android-review.googlesource.com/c/platform/external/ms-tpm-20-ref/+/1588810 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I129dc7f2440f5fbf48b094a4522b1fc6c7352489
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/ms-tpm-20-ref am: c3fcf27be9 am: ↵Bob Badour
d9cf4ed1df Original change: https://android-review.googlesource.com/c/platform/external/ms-tpm-20-ref/+/1588810 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I93e10fc39027a22e783413999f0831cc15f59c21
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/ms-tpm-20-ref am: c3fcf27be9Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/ms-tpm-20-ref/+/1588810 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5939e6ee2e49fb5d80ff210127b8190ed8af7f59
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/ms-tpm-20-refandroid-s-preview-1Bob Badour
Added SPDX-license-identifier-BSD SPDX-license-identifier-GPL-2.0 SPDX-license-identifier-MIT legacy_by_exception_only to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I843533f3368993b54d0886bbe6b134d9c25c8c02
2021-01-26Add required BY_EXCEPTION_ONLY header comment. am: 1ee4a096eb am: 77cf8485d5 ↵Bob Badour
am: 9bfbf09aee Original change: https://android-review.googlesource.com/c/platform/external/ms-tpm-20-ref/+/1559290 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I02a07ef5ac6d33f2b716f4788c1b15bfac17b0ab
2021-01-26Add required BY_EXCEPTION_ONLY header comment. am: 1ee4a096eb am: 77cf8485d5Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/ms-tpm-20-ref/+/1559290 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Idbc0af35a1db57e3681d1b791b68f498814d628f
2021-01-26Add required BY_EXCEPTION_ONLY header comment. am: 1ee4a096ebBob Badour
Original change: https://android-review.googlesource.com/c/platform/external/ms-tpm-20-ref/+/1559290 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0bd4667f69c04d7756219c5d372daf2a811eb95b
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-28 07:30:43 +0000