tree bfee2de8c31abcb652fe277da6019effc910402a
parent 453fc7e8ef3f53196d32aa1d08363cb9298f5ffa
parent 536cae75031e11ee30da0a0b4d4a0752e5526e96
author Amit Mahajan <amitmahajan@google.com> 1412728183 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412728183 +0000

am 536cae75: Merge "Send SMS over 1x when on eHRPD/LTE and active voice call" into lmp-dev

* commit '536cae75031e11ee30da0a0b4d4a0752e5526e96':
  Send SMS over 1x when on eHRPD/LTE and active voice call