tree 6f8b2e7972621b862ce2058460ea1eb400cfe279
parent 586ba76a37c6e7a4e917fefc9846e9f01bf120fb
parent 054a20c86b1aeae9f92a77069f9d06c619e938e5
author Tyler Gunn <tgunn@google.com> 1525809155 -0700
committer android-build-merger <android-build-merger@google.com> 1525809155 -0700

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

Change-Id: I3a79799d18f21dd585bbe94f323346b5d6ae8f84