tree 53617dfe252ae2dd7c42cc8160cd2dc9246bd233
parent fb4a18508dc92dac91d747496562ecdc910ef4dd
parent 845ffceadc0d68ac806ebd6a1811bb43019aefb6
author Andres Morales <anmorales@google.com> 1428949795 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1428949795 +0000

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

* commit '845ffceadc0d68ac806ebd6a1811bb43019aefb6':
  hw_auth_token: make timestamp 64 bits