tree 5cd5e5e8586a1c4a9cc7019e6a7d6bec18d85461
parent 0ca0d10f2e40d5a2d8637af206f7f19e20649416
parent a46a60cf5e3da25065a4188cbec49630f40f2186
author Shunkai Yao <yaoshunkai@google.com> 1670854290 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1670854290 +0000

Merge changes from topic "aidl_effect_lock" am: 6900a3c936 am: d1bd493ce0 am: a46a60cf5e

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

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