tree 057edc4b50707037518afff86d16fe87f3456527
parent 382717f3eeca1a21e9756c7de42b4d31747d1675
parent a0cdfbf5b74a92611789b7ec08a84274b9011021
author John Huang <jsh@google.com> 1287434464 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1287434464 -0700

Merge "Uncomment SIP/VOIP feature check in SipManager." into gingerbread