Commit a4659cc4 authored Jan 20, 2021 by Treehugger Robot Committed by Automerger Merge Worker Jan 20, 2021

Merge "Keystore 2.0 SPI: Use Timestamp from secure clock service" am:...

Merge "Keystore 2.0 SPI: Use Timestamp from secure clock service" am: f327ea25 am: 5e27a324 am: 7108d008

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1538990

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I574f5752b3b6e3aabad3305084048ff08c6dd63a

keystore/java/android/security/AuthTokenUtils.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -18,7 +18,7 @@ package android.security;

		import android.annotation.NonNull;
		import android.hardware.security.keymint.HardwareAuthToken;
		import android.hardware.security.keymint.Timestamp;
		import android.hardware.security.secureclock.Timestamp;

		import java.nio.ByteBuffer;
		import java.nio.ByteOrder;