| commit | 047022c37a87b1238e7461c6372c941bc86d3feb | [log] [tgz] |
|---|---|---|
| author | Hasini Gunasinghe <hasinitg@google.com> | Thu May 13 17:16:30 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu May 13 17:16:30 2021 +0000 |
| tree | 4060c5fc5d3077e7f4fb3d3930765659c6ea591f | |
| parent | e4795f0e60c4d80576a03deff878167dc7ede6ce [diff] | |
| parent | 0b18edf55e5344d9e15553199bcb0c4f20f7a082 [diff] |
Merge "Keystore 2.0: Make MonotonicRawTime use milliseconds." am: c1c58f0f77 am: efbeac0572 am: 0b18edf55e Original change: https://android-review.googlesource.com/c/platform/system/security/+/1706029 Change-Id: Ia132dd20b416ba91cdb1b223ed0e7f0c52ec5461