tree fc1f69f68b76e534183bb39a8117ff4d393945a0
parent 268595f26a4bd2e1376924c31092477a4f58dbf6
parent 3999464409b6038dfca2f00901af0021c7fedf73
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1576671943 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1576671943 +0000

Merge "Fixes sound panel create multiple SoundSettings activity" am: e45a8aadd4 am: 3999464409

Change-Id: I2b5875e2c79daf6e5b7173da59b33e2cfcfbad6e