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