| commit | faefa7634936f393c71aa1b65bc454269bb63448 | [log] [tgz] |
|---|---|---|
| author | Bram Bonné <brambonne@google.com> | Mon Nov 23 13:49:11 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Nov 23 13:49:11 2020 +0000 |
| tree | e5ef9fdb5a68717dfe36bb98a2d139013751ba75 | |
| parent | 6975aa858d8e6b6a7b337fbb4ea6d950afcdba91 [diff] | |
| parent | 6d7e4c43d65dc0d880fb1f496de11f3c085918a1 [diff] |
Merge "Adds two missing Keymaster definitions." am: 6d7e4c43d6 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1505232 Change-Id: Ib17609b0e8a1b40dd412692e70af9fedd2022325