| commit | 0f1525e00f6cfb0b4c7e9c7f89ea675dcd37946d | [log] [tgz] |
|---|---|---|
| author | David Drysdale <drysdale@google.com> | Thu May 12 05:18:06 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu May 12 05:18:06 2022 +0000 |
| tree | 503d736a0390eaf0e90c8ce35fea2f91325ed1b1 | |
| parent | 583217c8f1f27ec28924562fa6233df99786144e [diff] | |
| parent | 4d34e4163e1dfca1e5f830e84d8e0987a2f62c86 [diff] |
[automerger skipped] Expect x25519 data as SubjectPublicKeyInfo am: 415260e22f am: e5cbaa488d -s ours am: 59202a4750 -s ours am: 4d34e4163e -s ours am skip reason: Merged-In I0d515a7d3b7124288d36cbd219e3679fa5137f0c with SHA-1 415260e22f is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/keymaster/+/18281062 Change-Id: Ie5f3a2026368eb40e6b8b49564c41fe5f4cec26a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>