Gitiles
Code Review Sign In
gerrit.omnirom.org / android_system_security / ff5a2e048bf461e7c59366207f412425a432221f
commitff5a2e048bf461e7c59366207f412425a432221f[log] [tgz]
authorXin Li <delphij@google.com>Sat Sep 07 03:23:01 2024 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>Sat Sep 07 03:23:01 2024 +0000
tree422e1751dfb450d33689a5e2392fdc519ad2efab
parent045d21d6214bab2375d844df7c9e87ce66d98dd8 [diff]
parent1c6c1621cf9ba4ac9f9e38ca3376d180ceb57c88 [diff]
[automerger skipped] Merge 24Q3 to AOSP main am: 05b904603f -s ours am: 1c6c1621cf -s ours

am skip reason: Merged-In I4bae1255764b1687e5db6aec799057ac5612c200 with SHA-1 76311aab2a is already in history

Original change: https://android-review.googlesource.com/c/platform/system/security/+/3258597

Change-Id: I3626f96f93ba06e8fca13bedea6666ec74d62bd6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
tree: 422e1751dfb450d33689a5e2392fdc519ad2efab
  1. fsverity/
  2. fsverity_init/
  3. identity/
  4. keystore/
  5. keystore-engine/
  6. keystore2/
  7. mls/
  8. ondevice-signing/
  9. prng_seeder/
  10. provisioner/
  11. rustfmt.toml ⇨ ../../build/soong/scripts/rustfmt.toml
  12. .clang-format
  13. .gitignore
  14. Android.bp
  15. METADATA
  16. MODULE_LICENSE_APACHE2
  17. NOTICE
  18. OWNERS
  19. PREUPLOAD.cfg