tree 052b3875256a60b8343ba878e98511eef7d693e8
parent beccf3c48a6573da6dc0cb3d5e8e170664220f0c
parent b355714a2995ebe343808e06f69da5067f52a833
author Hung-ying Tyan <tyanh@google.com> 1283480816 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1283480816 -0700

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

Merge commit 'b355714a2995ebe343808e06f69da5067f52a833' into gingerbread-plus-aosp

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