tree 0248fe8eeb3810c803df7c6f06d1154b33eecc5d
parent 939ef15ed59819c238919cf8fcdfd518b0c96dde
parent 6a0d998380bda306c877a5f4fb4b080cde4f6503
author Treehugger Robot <treehugger-gerrit@google.com> 1557185410 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1557185410 +0000

Merge changes from topic "verbose-vendor-logging"

* changes:
  Fix grants get lost on key upgrade
  Clearly indicate vendor errors from keymaster in logcat