OSDN Git Service

Merge changes Id9a22ad3,I629ab2c4
authorShawn Willden <swillden@google.com>
Thu, 19 Mar 2015 00:27:37 +0000 (00:27 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Thu, 19 Mar 2015 00:27:38 +0000 (00:27 +0000)
commit254c58c4e760e0af132d680fbd783a38ef436435
tree89460604c791c3a50e24ccf920cb6b2a68bb83b7
parent437ac8f8445b078041171eff56ce7ffbd1cf6766
parentfe2b1a82989e20504bd934c67eb621ac0dcdb5e0
Merge changes Id9a22ad3,I629ab2c4

* changes:
  Add KM_TAG_AUTH_TOKEN.
  Add support for KM_TAG_USER_SECURE_ID.