| commit | 397e40b158d0ea3cd1d92f392dce987b45ed9813 | [log] [tgz] |
|---|---|---|
| author | Arve Hjønnevåg <arve@android.com> | Tue Oct 06 23:51:54 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Oct 06 23:51:54 2020 +0000 |
| tree | 29968d60a83275b52fda4cf46e90a53755c3f737 | |
| parent | 8c42a18cf8750f6aeeb1be48566951f0f0d46a22 [diff] | |
| parent | 3e7c3504a3f65513a8e776ace02a161e239cd7d4 [diff] |
Merge "trusty: keymaster: set_attestation_key: Change wrapped key" am: 3e7c3504a3 Original change: https://android-review.googlesource.com/c/platform/system/core/+/1446633 Change-Id: I44fd518b31ede08ebf01628d2252dd11c0bc57d7