tree 280f2fdbf20870de0785929695bde4e76545190f
parent b0adba8170cb5df45629876998229bc0f3c6dd6b
parent 93c57ca1b243c2cb4a6e516b1f99e7aed407e53a
author Shawn Willden <swillden@google.com> 1453743431 +0000
committer android-build-merger <android-build-merger@google.com> 1453743431 +0000

Merge "Update keystore_cli_v2 for keymaster_defs changes."
am: 93c57ca1b2

* commit '93c57ca1b243c2cb4a6e516b1f99e7aed407e53a':
  Update keystore_cli_v2 for keymaster_defs changes.