tree e4bb1df575fcf66ef7a30803663aa8155ec52f81
parent 3cedb29080beed6fcbb5a5d8dd8900276f582446
parent f478c654366a036086be79ec3f5684b940dc5baa
author Steven Moreland <smoreland@google.com> 1664827972 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1664827972 +0000

Merge changes from topic "hidl2aidl_confirmationui" am: 1b7bec0011 am: f478c65436

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

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