tree 6cc590e5dabccd2e4084c56a53d3257acbeb72b8
parent 84a60fff99c08dd930b12cec4bcd52d6fb040bc7
parent c7d8c198237d7ae73d5d9ab61bdcd0e8ec3aa3ea
author Michael Butler <butlermichael@google.com> 1646356930 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1646356930 +0000

Merge "Make NN canonical->HIDL adapter execute* methods synchronous" am: f955569c8a am: c7d8c19823

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

Change-Id: I09577f2bf81869613f9e61d15c68edd8a49e41ef