tree 39e9fe8effda1ebeb6bedade2cad415637b58729
parent f430b24100d0de4834ff069c1c87b3d39f9d1c61
parent 16948bab0f36fff0157eb5984c693f4cd8d0c083
author Joshua Mccloskey <joshmccloskey@google.com> 1632427516 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1632427516 +0000

[automerger skipped] Merge "Fixed NPE in FingerprintAuthClient" into sc-v2-dev am: e90025458d am: 16948bab0f -s ours

am skip reason: Merged-In I2f946cae240009af6963284c54825ab7b5efcc40 with SHA-1 c7cc5b866b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15855044

Change-Id: Icf1fd5a21e3b123d345fc32a4146f1506afd6d46