| commit | f9206292ead82379ab8a5dc370ef172599ce69d3 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Sat Sep 07 02:08:05 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Sep 07 02:08:05 2024 +0000 |
| tree | 1074dc429a53801995c9486e1cd2132daa07d9b2 | |
| parent | 91d4db46b8ebaea410f9f1504e1a134107ad11b0 [diff] | |
| parent | 4d2beaf64f23eb0a0816806a201b1cec3fcbad2e [diff] |
[automerger skipped] Merge 24Q3 to AOSP main am: c757329e9b -s ours am: 4d2beaf64f -s ours am skip reason: Merged-In I6c92491c177c141a91d84909ef046d20ded9d75f with SHA-1 a2c7b6a657 is already in history Original change: https://android-review.googlesource.com/c/platform/prebuilts/module_sdk/DeviceLock/+/3258439 Change-Id: I646dd6e8ab058a54449b30a6280a8f9d4063e921 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>