| commit | 2a4d9bdc9b7ab7d1ec838b083379e4bd80c5be5f | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Wed Jan 27 04:10:48 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jan 27 04:10:48 2021 +0000 |
| tree | 3099536e9bdfc7e7751190cf99b1de785b5e90fe | |
| parent | 037f20a0a4a8b089eb54fbc6a4aa628edd0c9df0 [diff] | |
| parent | 6d9a18843f962b15dc9fd0dbfbe7e83181c98767 [diff] |
Merge "KeyMint: Fix timestamp token argument name." am: c76b9d9ffe am: 6d9a18843f Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/1554747 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I945456e23025cc997b95fe81ca7055ec8f278710