commit | 78251806b5e41ab3b492621b4dbda82e8bb4a848 | [log] [tgz] |
---|---|---|
author | Xin Li <[email protected]> | Thu Mar 07 10:46:18 2024 +0000 |
committer | Automerger Merge Worker <[email protected]> | Thu Mar 07 10:46:18 2024 +0000 |
tree | 2ec5e3b5b710721652a405b7b4becad8966f8454 | |
parent | 99269f3191d22a6aa654d1068a239e36fd6c4f5f [diff] | |
parent | d14d2d32a5f87b299a2081f211159be052c23823 [diff] |
[automerger skipped] Merge Android 14 QPR2 to AOSP main am: c497ec16c4 -s ours am: d14d2d32a5 -s ours am skip reason: Merged-In I8a1f3b8781a641fff79ff3a92799645b14696ffc with SHA-1 62c2f9b368 is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/st/secure_element2/+/2990858 Change-Id: I77d8e897116b73dcd988010ed580e5eb84a16f7d Signed-off-by: Automerger Merge Worker <[email protected]>