tree becf33e564f39ef824e4e95c5eff41e817e69188
parent 43f102ed623d352495a99cf3d55836d7f18408f3
parent 961977fbb73af5e5b5088f1468054ab53f8d958b
author Treehugger Robot <treehugger-gerrit@google.com> 1604368007 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1604368007 +0000

Merge "Only play sound effects if stream is not muted." am: f18982cc19 am: 961977fbb7

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

Change-Id: I1cb7407a615b07dc5c7d6ed715dbe01690c45381