Gitiles
Code Review Sign In
review.blissroms.org / platform_frameworks_base / b69c64dbb8d402aa299bacc28d013a906185b5e1
commitb69c64dbb8d402aa299bacc28d013a906185b5e1[log] [tgz]
authorPrashant Patil <patilprashant@google.com>Thu May 02 10:02:13 2024 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>Thu May 02 10:02:13 2024 +0000
tree25b56e4eaad74258f9a3b854196ca28b3ed8917e
parenta869cc53d3828d49f736f736f03b95499dbe2470 [diff]
parent6b003be28a57cfef8b6afc060bbbcef218fe41ff [diff]
[automerger skipped] Merge "Revert^3 "Keystore: Validate curve names in XDH and ED25519"" into 24D1-dev am: 6b003be28a -s ours

am skip reason: Merged-In Ie63b8dfc8bb562b33e6e529d537bde64ae2c6d53 with SHA-1 934cd662e5 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/26744915

Change-Id: Idfdd2e4d65453b876303719c20c1b97109562ed3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
tree: 25b56e4eaad74258f9a3b854196ca28b3ed8917e
  1. .prebuilt_info/
  2. apct-tests/
  3. apex/
  4. api/
  5. boot/
  6. cmds/
  7. config/
  8. core/
  9. data/
  10. docs/
  11. drm/
  12. errorprone/
  13. graphics/
  14. identity/
  15. keystore/
  16. libs/
  17. location/
  18. media/
  19. mime/
  20. mms/
  21. native/
  22. nfc/
  23. nfc-extras/
  24. obex/
  25. omapi/
  26. opengl/
  27. packages/
  28. proto/
  29. ravenwood/
  30. rs/
  31. samples/
  32. sax/
  33. services/
  34. startop/
  35. telecomm/
  36. telephony/
  37. test-base/
  38. test-junit/
  39. test-legacy/
  40. test-mock/
  41. test-runner/
  42. tests/
  43. tools/
  44. wifi/
  45. .clang-format
  46. .gitignore
  47. .mailmap
  48. AconfigFlags.bp
  49. ADPF_OWNERS
  50. Android.bp
  51. BAL_OWNERS
  52. BATTERY_STATS_OWNERS
  53. BROADCASTS_OWNERS
  54. CleanSpec.mk
  55. framework-jarjar-rules.txt
  56. GAME_MANAGER_OWNERS
  57. INPUT_OWNERS
  58. INTENT_OWNERS
  59. ktfmt_includes.txt
  60. lint-baseline.xml
  61. LSE_APP_COMPAT_OWNERS
  62. MEMORY_OWNERS
  63. METADATA
  64. MODULE_LICENSE_APACHE2
  65. MULTIUSER_OWNERS
  66. NOTICE
  67. OWNERS
  68. OWNERS.md
  69. PACKAGE_MANAGER_OWNERS
  70. pathmap.mk
  71. PERFORMANCE_OWNERS
  72. PREUPLOAD.cfg
  73. ProtoLibraries.bp
  74. Ravenwood.bp
  75. SECURITY_STATE_OWNERS
  76. SQLITE_OWNERS
  77. TEST_MAPPING
  78. TestProtoLibraries.bp
  79. THERMAL_OWNERS
  80. TRACE_OWNERS
  81. WEAR_OWNERS
  82. ZYGOTE_OWNERS