| commit | 877a6e05bb08353a4f806ad4d3c9cf6f1c3fb097 | [log] [tgz] |
|---|---|---|
| author | nagendra modadugu <ngm@google.com> | Wed Oct 10 17:44:34 2018 -0700 |
| committer | nagendra modadugu <ngm@google.com> | Wed Oct 10 17:44:54 2018 -0700 |
| tree | 7bc4f07c500745d83fa204ff8158a264a0c1a294 | |
| parent | 6c7eb3eb68de6bc7b3b826b1aaadb8fc35efed3f [diff] | |
| parent | e30373edfc3c893547bd5b59c9c72e4f1652e353 [diff] |
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