tree d6bcbc3294f324cc62c9e61aea4d18eeb249ddfe
parent fae32ebc547b6664bcfc488eb860c8ba24d7611b
parent a29f5cc5defff87b0c78773205abf5d6f62ffeec
author Michael Butler <butlermichael@google.com> 1651555848 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1651555848 +0000

[automerger skipped] Merge "Handle case where NN AIDL callback is null in IDevice::prepareModel*" into tm-dev am: 9265715fc7 am: a29f5cc5de -s ours

am skip reason: Merged-In I4a15d02c4879a0261ec26cc0e7a47d0a4da86b8b with SHA-1 d6f6d01499 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/18102697

Change-Id: I8d8c57f5de716d0b71e9d4abe99cded44d84a5c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>