tree 89460604c791c3a50e24ccf920cb6b2a68bb83b7
parent 437ac8f8445b078041171eff56ce7ffbd1cf6766
parent fe2b1a82989e20504bd934c67eb621ac0dcdb5e0
author Shawn Willden <swillden@google.com> 1426724857 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1426724858 +0000

Merge changes Id9a22ad3,I629ab2c4

* changes:
  Add KM_TAG_AUTH_TOKEN.
  Add support for KM_TAG_USER_SECURE_ID.