| commit | 0bec85cb0c7a498d753590569a3e5196de8f61c1 | [log] [tgz] |
|---|---|---|
| author | David Drysdale <drysdale@google.com> | Fri Jul 19 07:45:32 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jul 19 07:45:32 2024 +0000 |
| tree | e0c9319cd3476317d2f9f88cab44b8255e52e0fb | |
| parent | 4ec99b2e6d0c2c547207506ff9d108e4295e8a8e [diff] | |
| parent | a1a61bd55b4ebd451792933e7323b79a50456182 [diff] |
Merge changes I803a0a7a,I7c2a7a3a into main am: 4a1303daa1 am: a1a61bd55b Original change: https://android-review.googlesource.com/c/platform/system/security/+/3182599 Change-Id: I3761ee59f213a3bd9cff190b84c3b33326a8360b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>