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)
commit546073a5b67601a39987a650fa176905149bd5c4
tree47ab40edc844c9b588c706eed47587964e624188
parentcb90628990f63157abee9c2d241ce0b5cd6d0950
parent569055dd608c21b2c763f896e73761007f125a50
Merge changes I7070326d,I8346e53c

* changes:
  Add OWNERS file to AndroidKeystoreSPI implementation
  KeyguardStateMonitor looses connection with keystore if keystore dies