summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-07-07Snap for 10453563 from 83e6a3034816cf375ea568de974e011dadec99a8 to ↵aml_sdk_341510000aml_sdk_341410000aml_sdk_341110080aml_sdk_341110000aml_sdk_341010000aml_sdk_340912010android14-mainline-sdkext-releaseAndroid Build Coastguard Worker
mainline-sdkext-release Change-Id: I536156949f248d72051089605bdd43e7af909a50
2022-08-17[automerger skipped] DO NOT MERGE - Merge Android 13 am: fa54746370 -s ours ↵ub-automotive-master-20231102ub-automotive-master-20231011android-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_r16aml_rkp_341510000aml_rkp_341311000aml_rkp_341114000aml_rkp_341015010aml_rkp_341012000aml_hef_341613000aml_hef_341512030aml_hef_341415040aml_hef_341311010aml_hef_341114030aml_cfg_341510000android14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-mainline-healthfitness-releaseandroid14-devandroid14-d2-s5-releaseandroid14-d2-s4-releaseandroid14-d2-s3-releaseandroid14-d2-s2-releaseandroid14-d2-s1-releaseandroid14-d2-releaseXin Li
am: fa16033923 -s ours am: 16aed59b07 -s ours am: dc345a71c3 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/external/ukey2/+/2186777 Change-Id: Ifb333e8b273b003f1be502b304a17e93fb37aa3a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17[automerger skipped] DO NOT MERGE - Merge Android 13 am: fa54746370 -s ours ↵ub-automotive-master-20230622ub-automotive-master-20230427ub-automotive-master-20230303ub-automotive-master-20221215android-u-beta-1-gplmain-16k-with-phonesXin Li
am: fa16033923 -s ours am: 16aed59b07 -s ours am skip reason: Merged-In Iad70e328fcfe84171dae9a83a0981686e7503e9b with SHA-1 239ca39078 is already in history Original change: https://android-review.googlesource.com/c/platform/external/ukey2/+/2186777 Change-Id: I5d5c9caea96ba8bfce728a95a8d53d40e46fa511 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16[automerger skipped] DO NOT MERGE - Merge Android 13 am: fa54746370 -s ours ↵Xin Li
am: fa16033923 -s ours am skip reason: Merged-In Iad70e328fcfe84171dae9a83a0981686e7503e9b with SHA-1 239ca39078 is already in history Original change: https://android-review.googlesource.com/c/platform/external/ukey2/+/2186777 Change-Id: I2550d8fdd6e7e0074ef97982e1f780c7470d5378 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16[automerger skipped] DO NOT MERGE - Merge Android 13 am: fa54746370 -s oursXin Li
am skip reason: Merged-In Iad70e328fcfe84171dae9a83a0981686e7503e9b with SHA-1 239ca39078 is already in history Original change: https://android-review.googlesource.com/c/platform/external/ukey2/+/2186777 Change-Id: Ide3013201c4c24f002a8454e9b597ed0041b984f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-15DO NOT MERGE - Merge Android 13ub-automotive-master-20221102main-16kXin Li
Bug: 242648940 Merged-In: Iad70e328fcfe84171dae9a83a0981686e7503e9b Change-Id: I15d23598e8c879177d297410d4f18a5225fb1135
2022-06-30[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: ↵Xin Li
f8ce6f3ae8 -s ours am: 73c02ea35e -s ours am: d476a17d97 -s ours am: 4b5382fa83 -s ours am skip reason: Merged-In Iad70e328fcfe84171dae9a83a0981686e7503e9b with SHA-1 239ca39078 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/ukey2/+/19094060 Change-Id: I81ea76441a13b99fb633835e0c17246d6631ea1d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: ↵Xin Li
f8ce6f3ae8 -s ours am: 73c02ea35e -s ours am: d476a17d97 -s ours am skip reason: Merged-In Iad70e328fcfe84171dae9a83a0981686e7503e9b with SHA-1 239ca39078 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/ukey2/+/19094060 Change-Id: I1878da377fb8ef24925b5c409f0df90e03d436e7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-29[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: ↵Xin Li
f8ce6f3ae8 -s ours am: 73c02ea35e -s ours am skip reason: Merged-In Iad70e328fcfe84171dae9a83a0981686e7503e9b with SHA-1 239ca39078 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/ukey2/+/19094060 Change-Id: I1236c76fefbba0762e55737673d11ceaded30ef6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-29[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: ↵Xin Li
f8ce6f3ae8 -s ours am skip reason: Merged-In Iad70e328fcfe84171dae9a83a0981686e7503e9b with SHA-1 239ca39078 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/ukey2/+/19094060 Change-Id: If07814c6397ce6fe016db639e926b1f44e6fedac Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-27Merge tm-dev-plus-aosp-without-vendor@8763363temp_sam_242648940Xin Li
Bug: 236760014 Merged-In: Iad70e328fcfe84171dae9a83a0981686e7503e9b Change-Id: Ie56ae273729a536f3610d170dd5bd139a9d927c6
2022-05-10Snap for 8564071 from 239ca39078b40c1ec2e05afd5a5657a7c2f41e80 to ↵aml_sdk_331812000aml_sdk_331811100aml_sdk_331811000aml_sdk_331412000aml_sdk_331410000aml_sdk_331310010aml_sdk_331111000aml_sdk_330810050aml_sdk_330810010android13-mainline-sdkext-releaseAndroid Build Coastguard Worker
mainline-sdkext-release Change-Id: I8925f2c2a975cb7b1729607c7a3504cc3b84138a
2021-11-30Avoid "man-in-the-middle" term.t_frc_odp_330442040t_frc_odp_330442000t_frc_con_330443020t_frc_cbr_330443000t_frc_ase_330444010t_frc_art_330443060t_frc_adb_330444000android-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_r55android-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_r32android-13.0.0_r30android-13.0.0_r29android-13.0.0_r28android-13.0.0_r27android-13.0.0_r24android-13.0.0_r23android-13.0.0_r22android-13.0.0_r21android-13.0.0_r20android-13.0.0_r19android-13.0.0_r18android-13.0.0_r17android-13.0.0_r16aml_uwb_331910010aml_uwb_331820070aml_uwb_331613010aml_uwb_331611010aml_uwb_331410010aml_uwb_331310030aml_uwb_331115000aml_uwb_331015040aml_uwb_330810010aml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_331910000aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000aml_go_wif_330911000aml_go_uwb_330912000aml_go_tz4_330912000aml_go_tet_330914010aml_go_swc_330913000aml_go_sta_330911000aml_go_sdk_330810000aml_go_sch_330911000aml_go_res_330912000aml_go_per_330912000aml_go_odp_330913000aml_go_odp_330912000aml_go_neu_330912000aml_go_net_330913000aml_go_mpr_330912000aml_go_ase_330913000aml_go_ads_330915100aml_go_ads_330915000aml_go_ads_330913000aml_go_adb_330913000aml_ase_331311020aml_ase_331112000aml_ase_331011020aml_ads_331920180aml_ads_331814200aml_ads_331710270aml_ads_331611190aml_ads_331511020aml_ads_331418080aml_ads_331131000android13-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-qpr1-s8-releaseandroid13-qpr1-s7-releaseandroid13-qpr1-s6-releaseandroid13-qpr1-s5-releaseandroid13-qpr1-s4-releaseandroid13-qpr1-s3-releaseandroid13-qpr1-s2-releaseandroid13-qpr1-s1-releaseandroid13-qpr1-releaseandroid13-mainline-uwb-releaseandroid13-mainline-tzdata4-releaseandroid13-mainline-go-wifi-releaseandroid13-mainline-go-uwb-releaseandroid13-mainline-go-tzdata4-releaseandroid13-mainline-go-tethering-releaseandroid13-mainline-go-sdkext-releaseandroid13-mainline-go-scheduling-releaseandroid13-mainline-go-resolv-releaseandroid13-mainline-go-permission-releaseandroid13-mainline-go-os-statsd-releaseandroid13-mainline-go-odp-releaseandroid13-mainline-go-neuralnetworks-releaseandroid13-mainline-go-networking-releaseandroid13-mainline-go-mediaprovider-releaseandroid13-mainline-go-media-swcodec-releaseandroid13-mainline-go-appsearch-releaseandroid13-mainline-go-adservices-releaseandroid13-mainline-go-adbd-releaseandroid13-mainline-appsearch-releaseandroid13-mainline-adservices-releaseandroid13-frc-odp-releaseandroid13-frc-conscrypt-releaseandroid13-frc-cellbroadcast-releaseandroid13-frc-art-releaseandroid13-frc-adbd-releaseandroid13-devandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseandroid13-d3-s1-releaseandroid13-d2-releaseaml_tz4_332714010Aaron Labiaga
See https://source.android.com/setup/contribute/respectful-code#term-examples Change-Id: Iad70e328fcfe84171dae9a83a0981686e7503e9b Bug: 140836267
2021-09-20Remove external/ukey2/.gitmodules and submodule directories. am: e711039fa9 ↵Raman Tenneti
am: 492edd667d am: fbfc8c2de3 am: b17f755513 am: a497b2f9fa Original change: https://android-review.googlesource.com/c/platform/external/ukey2/+/1830387 Change-Id: I18e2cd03ebd25f0df309fa7a425f16a7c92c2a1e
2021-09-20Remove external/ukey2/.gitmodules and submodule directories. am: e711039fa9 ↵Raman Tenneti
am: 492edd667d am: fbfc8c2de3 am: b17f755513 Original change: https://android-review.googlesource.com/c/platform/external/ukey2/+/1830387 Change-Id: If4ceeba275a5e16493d40f226021f8fe3aa7fe21
2021-09-20Remove external/ukey2/.gitmodules and submodule directories. am: e711039fa9 ↵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
am: 492edd667d am: fbfc8c2de3 Original change: https://android-review.googlesource.com/c/platform/external/ukey2/+/1830387 Change-Id: I39b782244d2516ef02aad5f9b23f49337033886b
2021-09-20Remove external/ukey2/.gitmodules and submodule directories. am: e711039fa9 ↵Raman Tenneti
am: 492edd667d Original change: https://android-review.googlesource.com/c/platform/external/ukey2/+/1830387 Change-Id: Ib556b731106c01012ac82308f16d5d8c87736338
2021-09-20Remove external/ukey2/.gitmodules and submodule directories. am: e711039fa9android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-s-v2-preview-1Raman Tenneti
Original change: https://android-review.googlesource.com/c/platform/external/ukey2/+/1830387 Change-Id: I91219edd5fd1166e381d1e03ede194bd8fd8e49c
2021-09-17Remove external/ukey2/.gitmodules and submodule directories.Raman Tenneti
git doesn't support submodules in external directory. Bug: 152899985 Test: Presubmit-Verify Change-Id: I11401a848b6d3b87568c795cad3e3762eb256513
2021-07-21Snap for 7570015 from cb927b6a63a44463f10311ba1dc04718d07f8558 to ↵android-mainline-12.0.0_r81android-mainline-12.0.0_r37android-mainline-12.0.0_r17android-mainline-12.0.0_r109aml_sdk_311710000android12-mainline-sdkext-releaseAndroid Build Coastguard Worker
mainline-sdkext-release Change-Id: Ib14c9cfa35539d745c592a5e53810672bfbaf0ef
2021-06-02Merge sc-mainline-prodXin Li
Bug: 189946434 Change-Id: Ibe2488cb83b5466eceaa1de2c5e9c3e70fd0a3a5
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: f03303943a -s ↵Xin Li
ours am: c0f8bf627b -s ours am: d54d4552bb -s ours am skip reason: Change-Id I2c2a81b364f8b636fd02db7923951c4da73731fd with SHA-1 fb49f0bc73 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I9fbf0bb4fe1e747cc88d375c2c5adaf7b3d9dcd7
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: f03303943a -s ↵android-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-releaseXin Li
ours am: c0f8bf627b -s ours am: d54d4552bb -s ours am skip reason: Change-Id I2c2a81b364f8b636fd02db7923951c4da73731fd with SHA-1 fb49f0bc73 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I1983b4bef295a1eee16fa71544f7cb8aff678039
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: f03303943a -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: c0f8bf627b -s ours am skip reason: Change-Id I2c2a81b364f8b636fd02db7923951c4da73731fd with SHA-1 fb49f0bc73 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I21a0aa1b6d1c0ca1d642d5a5f5fb6b23d715e49a
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: f03303943a -s oursXin Li
am skip reason: Change-Id I2c2a81b364f8b636fd02db7923951c4da73731fd with SHA-1 fb49f0bc73 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic736e989b6a14ec75173a4bf00e986ee59e7f3fd
2021-02-20Mark ab/7061308 as merged in stage.android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1android-s-beta-5android-s-beta-4Xin Li
Bug: 180401296 Merged-In: I2c2a81b364f8b636fd02db7923951c4da73731fd Change-Id: I902548e770b4e3ed9bdc4ef12460f30bdcb346d9
2021-02-08Merge remote-tracking branch 'aosp/upstream-master' into mymerge am: ↵Elliott Hughes
77f068fc5a am: bd0ecf8534 am: 974bcc2830 am: 5c396b21a4 Original change: https://android-review.googlesource.com/c/platform/external/ukey2/+/1579488 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I3400b7fcae3272905dcb01e1eeb38e867b65af71
2021-02-08Merge remote-tracking branch 'aosp/upstream-master' into mymerge am: ↵Elliott Hughes
77f068fc5a am: bd0ecf8534 am: 974bcc2830 am: 5c396b21a4 Original change: https://android-review.googlesource.com/c/platform/external/ukey2/+/1579488 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0d84ef7c40f398b994f470f084ec892833764d17
2021-02-08Merge remote-tracking branch 'aosp/upstream-master' into mymerge am: ↵Elliott Hughes
77f068fc5a am: bd0ecf8534 am: 974bcc2830 Original change: https://android-review.googlesource.com/c/platform/external/ukey2/+/1579488 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I91cc174d53d83378b55c71c0e3c49a195eabc967
2021-02-08Merge remote-tracking branch 'aosp/upstream-master' into mymerge am: ↵Elliott Hughes
77f068fc5a am: bd0ecf8534 Original change: https://android-review.googlesource.com/c/platform/external/ukey2/+/1579488 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0872d0ae6854fd12e954d369e319fa96ed4dd02f
2021-02-08Merge remote-tracking branch 'aosp/upstream-master' into mymerge am: 77f068fc5aElliott Hughes
Original change: https://android-review.googlesource.com/c/platform/external/ukey2/+/1579488 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I1fda713b3e409263c3927bdb79c530052e9d86da
2021-02-08Merge remote-tracking branch 'aosp/upstream-master' into mymergeandroid-s-preview-1Elliott Hughes
Also fix METADATA to point to upstream so this project stays up to date. Bug: http://b/179674268 Test: treehugger Change-Id: I0a644fbb3688daec2565daa5d2cf530e15b68f9f
2021-02-05[LSC] Add LOCAL_LICENSE_KINDS to external/ukey2 am: 2662d7a9f9 am: ↵Bob Badour
281be9c6db am: 2e1f8ba69d am: 66b58ac3f2 Original change: https://android-review.googlesource.com/c/platform/external/ukey2/+/1575972 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I7a4d19c82bdefac694471043b28a3a6b30069cf0
2021-02-05[LSC] Add LOCAL_LICENSE_KINDS to external/ukey2 am: 2662d7a9f9 am: ↵Bob Badour
281be9c6db am: 2e1f8ba69d am: 66b58ac3f2 Original change: https://android-review.googlesource.com/c/platform/external/ukey2/+/1575972 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I94d35ae06af95ac5f73434eb6dd06290617306e4
2021-02-05[LSC] Add LOCAL_LICENSE_KINDS to external/ukey2 am: 2662d7a9f9 am: ↵Bob Badour
281be9c6db am: 2e1f8ba69d Original change: https://android-review.googlesource.com/c/platform/external/ukey2/+/1575972 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I69bc6dd2ab6fef71e73ad17d7b2b2aef3cb63321
2021-02-05[LSC] Add LOCAL_LICENSE_KINDS to external/ukey2 am: 2662d7a9f9 am: 281be9c6dbBob Badour
Original change: https://android-review.googlesource.com/c/platform/external/ukey2/+/1575972 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iae4676c5eb7368550765f7747499d8b2299fdd46
2021-02-05[LSC] Add LOCAL_LICENSE_KINDS to external/ukey2 am: 2662d7a9f9Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/ukey2/+/1575972 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id55a38435c40539deb8ed4aa3948149f43f9c85b
2021-02-05[LSC] Add LOCAL_LICENSE_KINDS to external/ukey2Bob Badour
Added SPDX-license-identifier-Apache-2.0 to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: Idb9680f9037d6f99c780edc9ae9639391eb8d8da
2020-11-25Mark ab/6881855 as merged am: f19a71e27c am: fb49f0bc73Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/ukey2/+/13109973 Change-Id: I5bb3f8fa8bfea698f7709c06e093257ad30e43db
2020-11-25Mark ab/6881855 as merged am: f19a71e27cXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/ukey2/+/13109973 Change-Id: I2c2a81b364f8b636fd02db7923951c4da73731fd
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: Ia79df205ec3c568f3863f4273fb937d047677fbf
2020-11-10Update ukey2 am: 1182deea1e am: be53c6d491 am: 5b7b1e9c88 am: c2618c2887Erin Yan
Original change: https://android-review.googlesource.com/c/platform/external/ukey2/+/1484639 Change-Id: Ie7fa00b0aeb9395a998455360119e26758e4cc17
2020-11-10Update ukey2 am: 1182deea1e am: be53c6d491 am: 5b7b1e9c88Erin Yan
Original change: https://android-review.googlesource.com/c/platform/external/ukey2/+/1484639 Change-Id: I6815cdf3ee57071719925273b89affc1cc82e8b0
2020-11-10Update ukey2 am: 1182deea1e am: be53c6d491Erin Yan
Original change: https://android-review.googlesource.com/c/platform/external/ukey2/+/1484639 Change-Id: I09f33b68004442fa4f3f628356b6fa36e8db18cd
2020-11-10Update ukey2 am: 1182deea1eErin Yan
Original change: https://android-review.googlesource.com/c/platform/external/ukey2/+/1484639 Change-Id: Idddc0d0da99800fd4c1d074f8da11ef25eaab553
2020-11-09Update ukey2Erin Yan
This update is being pulled in from github https://github.com/google/ukey2 This update only includes java lib Bug: 172576615 Test: Build Change-Id: I7ee4375b7ed3c3908ec6672f529a88aa6080efb9
2020-07-06Merge pull request #6 from apolyudov/masterAlexei Czeskis
Roll forward to cl/319125760
2020-06-30Roll forward to cl/319125760Alexey Polyudov
Signed-off-by: Alexey Polyudov <apolyudov@google.com> Change-Id: I948aa562e910c896aa7803c0ba275e8efa95804c
2020-06-22Merge pull request #4 from apolyudov/masterAlexei Czeskis
Bring ukey2 up-to-date with internal code
2020-06-22Switch securemessage submodule project to google/Alexey Polyudov
clean up gradle artifacts. add c++ test helper app. Signed-off-by: Alexey Polyudov <apolyudov@google.com> Change-Id: I96cde0abe95a3a2995df23e0661058e4e650ae87
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-18 07:12:27 +0000