tree c26ad163189fd177076be97a67bb10c672292ffd
parent 78157454e484a6900ddea70097115a68d57d62f4
parent 1e4630d84495bde00fd2287419ac7767f69971d4
author Treehugger Robot <treehugger-gerrit@google.com> 1620754223 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1620754223 +0000

Merge "keymaster: avoid deref'ing nullptr" am: 1e4630d844

Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/1555467

Change-Id: Id2c877c087b5b46ccefd179a83a2009edce5cace