tree 0760202347610657b2d0cc8130ce7d4a44aac735
parent b4332985306632306fdcc77c81fe09f84fe37737
parent ea16e72bff350c0b6e2a00a82b934d1a2fc0fa2d
author Hung-ying Tyan <tyanh@google.com> 1283481016 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1283481016 -0700

am ea16e72b: am b355714a: Merge "SipManager: always return true for SIP API and VOIP support query." into gingerbread

Merge commit 'ea16e72bff350c0b6e2a00a82b934d1a2fc0fa2d'

* commit 'ea16e72bff350c0b6e2a00a82b934d1a2fc0fa2d':
  SipManager: always return true for SIP API and VOIP support query.