OSDN Git Service

Merge changes I7070326d,I8346e53c
authorTreehugger Robot <treehugger-gerrit@google.com>
Thu, 11 Oct 2018 19:05:27 +0000 (19:05 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Thu, 11 Oct 2018 19:05:27 +0000 (19:05 +0000)
* changes:
  Add OWNERS file to AndroidKeystoreSPI implementation
  KeyguardStateMonitor looses connection with keystore if keystore dies


Trivial merge