tree c26ad163189fd177076be97a67bb10c672292ffd
parent e7639dc35648009a311369ff89ff6ef83531bff7
parent 19361e0a7af74155579d6eab91cb8691d8149da6
author Treehugger Robot <treehugger-gerrit@google.com> 1620756826 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1620756826 +0000

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

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

Change-Id: I07c45764be8cf02ca8d70fe0375aabf55e35912d