tree 1483b88d39c40bfac52f6454f711bd106e85b1b3
parent 96761561884e4bbf49223c09d124fd45b174fd6d
parent 3d2c1845accf570e290eb1127ecbed1a3b5ba442
author Anthony Lee <anthonylee@google.com> 1410444993 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410444993 +0000

am 3d2c1845: am dbaa001a: am 0fc868ba: Merge "Make sure that we request a ringback on SIP connections." into lmp-dev

* commit '3d2c1845accf570e290eb1127ecbed1a3b5ba442':
  Make sure that we request a ringback on SIP connections.