commit | b2b91344e1d363d215b5cbb74d214668b52a4ced | [log] [tgz] |
---|---|---|
author | John Huang <jsh@google.com> | Tue Oct 19 09:54:16 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 19 09:54:16 2010 -0700 |
tree | 01d1359a3be31beb124000693824974d0390b309 | |
parent | 9bf9f0b13f834f53582025ae64750ffcdcf13ed1 [diff] | |
parent | 99fddbcf44e191de19de1e4e20467c5070226ebc [diff] |
am 085996c4: am 45bd8303: Merge "Uncomment SIP/VOIP feature check in SipManager." into gingerbread Merge commit '085996c411b4d3878dfd97c59bfc4a17da08959b' * commit '085996c411b4d3878dfd97c59bfc4a17da08959b': Uncomment SIP/VOIP feature check in SipManager.