| commit | f03410d5216d67eaf3fedc788f33095b095f09e3 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Mon Dec 21 18:37:15 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Dec 21 18:37:15 2020 +0000 |
| tree | c36464b86e25480c865b37a3b990e5ef6ac2d519 | |
| parent | 210d372cc679f8ceedb76ffc3c110b8c6a299eef [diff] | |
| parent | 67fd77331b63fd062be2a2203fdbc5282601c455 [diff] |
Merge "Change KeyParameters to use a union." am: 67fd77331b Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/1520083 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia9c6a5a1e17c0e2ae1b211d6b5308c2dc2617fad