tree 974f14ea18947a1948d09ec8a13b53103d10fe78
parent c1ef94962889276bdb3da2dd6aabbf445baa02b9
author nagendra modadugu <ngm@google.com> 1539218674 -0700
committer JP Sugarbroad <jpsugar@google.com> 1544085261 -0800

Merge remote-tracking branch 'goog/upstream-pixel18' into ota-rc8

* goog/upstream-pixel18:
  keymaster: abort operations on HAL errors

Bug: 116055338
Bug: 113354499
Test: release tests pass
Change-Id: I788fbbb1ddbbb498e22c387f688caf1c07b1bb42
(cherry picked from commit 877a6e05bb08353a4f806ad4d3c9cf6f1c3fb097)