tree 3f82852342207f170abb79bcd962cbb412d8dd23
parent 059320212496f83fd4b64c8252c507258058629d
parent 9e4985e8cb40e6e53a01a1080c210c0c09be305f
author Andres Morales <anmorales@google.com> 1428951147 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1428951147 +0000

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

* commit '9e4985e8cb40e6e53a01a1080c210c0c09be305f':
  hw_auth_token: make timestamp 64 bits