tree d79635a2b7b252f5fc4a4b1cc4667ef706042e40
parent 9d8332613a7ee7c57815926963fd75dfc07cc6e9
parent 8298d0590be502c14820c7bfe18e0c16c1ff8b66
author TreeHugger Robot <treehugger-gerrit@google.com> 1591983233 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1591983233 +0000

Merge "Merge "Add mutual exclusion access for addOrUpdateStream and removeStream" am: af108c45d6 am: 760c2bccd2 am: bd580a07b4 am: 91e082a90d am: 7f6cc71fe5" into rvc-dev am: d32c56d24d am: 8298d0590b

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11697200

Change-Id: Icddc16e458cdca472eb376ccfefdb0b3c91b0b11