tree 27bbc5d508fc7a2ddaa93dcf8bdc84e0ba691b97
parent 2998cb124212b1993a7d9fb5a93522b7955e329b
parent c1bb1bc3645563bb86f00969031d6e0a705dce8c
author David Brown <dab@google.com> 1321571574 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1321571574 -0800

am 19a57bde: am 1733a3de: Merge "SIP addresses containing "911" shouldn\'t be considered emergency calls" into ics-mr1

* commit '19a57bdedf3f9ccfa4d45cd35ef4b379853c6a81':
  SIP addresses containing "911" shouldn't be considered emergency calls