tree f4e8ae37814dfa21eb376ef0b20457f70de5d769
parent d97bd43fe80f5ff6f6c96f6c5c7a7e2ca6c281aa
parent ad49c06dab2875ce4c603b8e751e0f814c5201f6
author Michael Butler <butlermichael@google.com> 1651559250 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1651559250 +0000

[automerger skipped] Merge "Handle case where NN AIDL callback is null in IDevice::prepareModel*" into tm-dev am: 9265715fc7 -s ours am: 8fcd54e332 -s ours am: c6f7cb27f8 -s ours am: ad49c06dab -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: I13fd3fa278c97b8bee02f4ee588b850fdd3930f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>