tree f4ddb0b05310f70f19020bed8dcb7f18c4c83685
parent 7c022176a6b0dd38c1cb6d9bd1920a87659e5a1e
parent a93df131b78ec1d35527e480b1eaf4071c3a7bba
author Tyler Gunn <tgunn@google.com> 1418168928 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1418168928 +0000

am a93df131: am 0b251018: am 58569579: Merge "Display "Can\'t switch calls." on "RESUME" supp service failure." into lmp-mr1-dev

* commit 'a93df131b78ec1d35527e480b1eaf4071c3a7bba':
  Display "Can't switch calls." on "RESUME" supp service failure.