tree 6e7293ce404d0bac1f4614cdc83b97c6e1945b16
parent 2df72eb30fb5b52b63aa3095aa509ad114d3d8fe
parent cc02120a73a1433c9780aeb508b76e7a755e90df
author Tyler Gunn <tgunn@google.com> 1517611944 +0000
committer android-build-merger <android-build-merger@google.com> 1517611944 +0000

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

Change-Id: I575b6b318ae66d94f6984b1396486998b0085d56