tree 8b84a9a83800bfe018421269429b1bf6ece5c48f
parent 1bd119225caf3f0d0ff9d22ba7f5257e6f83fd41
parent e649400a3e595aae285487a3b27a76ac6542313e
author Tyler Gunn <tgunn@google.com> 1517610194 +0000
committer android-build-merger <android-build-merger@google.com> 1517610194 +0000

Merge "Ensure emergency call tone plays regardless of ringer volume." am: 97532b297e
am: e649400a3e

Change-Id: I8ea44fcb838c70b7054d200aa1c9ef45bc8615e7