tree 8d25548e4428dc55bc17591bd0c35efe5bb29cf7
parent 6760287c497478d331166004df23341d1cfc232d
parent 5acebf56729f1307c4971a601ab38f6a320d0562
author Shawn Willden <swillden@google.com> 1408658456 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1408658456 +0000

am 5acebf56: Allow GoogleKeymaster caller to specify creation time, since Trusty can\'t.

* commit '5acebf56729f1307c4971a601ab38f6a320d0562':
  Allow GoogleKeymaster caller to specify creation time, since Trusty can't.