am 9e4985e8: am 845ffcea: Merge "hw_auth_token: make timestamp 64 bits"

* commit '9e4985e8cb40e6e53a01a1080c210c0c09be305f':
  hw_auth_token: make timestamp 64 bits
diff --git a/include/hardware/hw_auth_token.h b/include/hardware/hw_auth_token.h
index 2740758..f471d1a 100644
--- a/include/hardware/hw_auth_token.h
+++ b/include/hardware/hw_auth_token.h
@@ -42,7 +42,7 @@
     uint64_t user_id;             // secure user ID, not Android user ID
     uint64_t authenticator_id;    // secure authenticator ID
     uint32_t authenticator_type;  // hw_authenticator_type_t, in network order
-    uint32_t timestamp;           // in network order
+    uint64_t timestamp;           // in network order
     uint8_t hmac[32];
 } hw_auth_token_t;