tree 49b1a083c70117bcc5bb18a5bf073f8e45d43cd8
parent 3a54136ce098ebb5dfbb5aca623f532049b41a76
parent 866998cac4e98715bf456d05fb52b67c829cc9a9
author Sal Savage <salsavage@google.com> 1556207220 -0700
committer android-build-merger <android-build-merger@google.com> 1556207220 -0700

Merge "Fix NPE in MceStateMachine when getState() is called during shut down"
am: 866998cac4

Change-Id: If667144a6994f5968f1e531fab90c064f779784d