OSDN Git Service

am 254c58c4: Merge changes Id9a22ad3,I629ab2c4
authorShawn Willden <swillden@google.com>
Thu, 19 Mar 2015 00:41:58 +0000 (00:41 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 19 Mar 2015 00:41:58 +0000 (00:41 +0000)
commit615f39f911cdc4201b4e1c63c79ae1819a6645ea
tree6917d857cc44fb3c27f2593eba9559cca8867151
parent8b8a045133e0466e964b4094269585708805b90a
parent254c58c4e760e0af132d680fbd783a38ef436435
am 254c58c4: Merge changes Id9a22ad3,I629ab2c4

* commit '254c58c4e760e0af132d680fbd783a38ef436435':
  Add KM_TAG_AUTH_TOKEN.
  Add support for KM_TAG_USER_SECURE_ID.