tree a45bad01f08102f5d0fe45d6444356e11deb99a3
parent dd8d38b2425cf0a8950a68d58e8b2f93451924f3
parent 95c3e899e9db5e95f92eb4cc56787216bc29f3ff
author Tomoharu Kasahara <tomoharu.kasahara@sony.com> 1521824310 +0000
committer android-build-merger <android-build-merger@google.com> 1521824310 +0000

Merge "The sonification sound is muted during a shutter sound" am: a4c38d6eb4 am: 2b82a9a1b1
am: 95c3e899e9

Change-Id: I73cd7bcf00440c320551f191cb6716ad22b13439