Google Git
Sign in
android / platform / system / keymaster / 587210b400f6f529bb80334c434ab1c7ea07dc06
commit587210b400f6f529bb80334c434ab1c7ea07dc06[log] [tgz]
authorXin Li <delphij@google.com>Fri Oct 06 11:01:13 2023 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>Fri Oct 06 11:01:13 2023 +0000
treeea0ac3c5beffac8161e445b9bafc6b3ae8bcf30f
parentbda4023993be5a8909bca9eb37bee04e8b89cef8 [diff]
parentaaa7cd0c47823dfc3f75432bc59ad7593e9b878f [diff]
[automerger skipped] Merge Android 14 am: 0b267890b7 -s ours am: 49e25a42b6 -s ours am: fef7dc670a -s ours am: aaa7cd0c47 -s ours

am skip reason: Merged-In Ie85684084c9820814ba4bfb9e3a46e297f6f3e3a with SHA-1 77ec0e4279 is already in history

Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/2775064

Change-Id: I9766eb2d49e5dea71cdafc6634bb2d341a133295
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
tree: ea0ac3c5beffac8161e445b9bafc6b3ae8bcf30f
  1. android_keymaster/
  2. contexts/
  3. cppcose/
  4. fuzzer/
  5. include/
  6. key_blob_utils/
  7. km_openssl/
  8. legacy_support/
  9. ng/
  10. tests/
  11. .clang-format
  12. .gitignore
  13. Android.bp
  14. km0_sw_rsa_512.blob
  15. km1_sw_ecdsa_256.blob
  16. km1_sw_rsa_512.blob
  17. km1_sw_rsa_512_unversioned.blob
  18. METADATA
  19. MODULE_LICENSE_APACHE2
  20. NOTICE
  21. OWNERS
  22. PREUPLOAD.cfg
  23. sw_rsa_attest_root.key.pem
  24. TEST_MAPPING
  25. valgrind.supp