tree 43cbe1a2cfafcb6e770c3de0d357bdb98d651ee3
parent fe4ae070a1389401643fff61ffdb4aaed5210858
parent 5a785f9a183ca78a58a40e5c67897147c4edc235
author Treehugger Robot <treehugger-gerrit@google.com> 1679551822 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1679551822 +0000

[automerger skipped] Merge "Replace PlaybackActivityMonitor with AudioDeviceCallback" am: 3424cdb269 am: f2799acb5d am: f4a8a48238 -s ours am: 5a785f9a18 -s ours

am skip reason: Merged-In Ieab2b408af537b477030ba75f8ae2b69ea8e4528 with SHA-1 e30838778e is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/MusicFX/+/2504276

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