tree a62a2857b193a18128dd4dbf189a58fa6f89a293
parent 5ec229e1ef6695e0c5453bf6a0b26e434bc08a63
parent 27467d304b9db8f41b3c91d12d66c9fe34311d0b
author Avinash Malipatil <avinashmp@google.com> 1700792173 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1700792173 +0000

Merge "Fix timer and RtcpEncoder mutex nesting" into udc-qpr-dev am: 27467d304b

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/ImsMedia/+/25418378

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