tree 36961d82e52def26af1202663128c0a841d53f08
parent 1f7773464f18ec98307fad381b0b1fe4f94a24f7
parent 760294e0852d5edeb62bb95793e31e60c84cb52e
author Tyler Gunn <tgunn@google.com> 1525808590 -0700
committer android-build-merger <android-build-merger@google.com> 1525808590 -0700

[automerger skipped] Merge "Ensure CDMA emergency tone/vibration respects ringer mode." am: 58bf5020c9
am: 760294e085  -s ours

Change-Id: I817e6a414ec8386861b485d9b37331b6cdf3d47b