tree 311b4b15a987964ffba8daacafa1be7127b71820
parent 024d59601e8439e6884e50c22301e35eaf53120a
parent e7b92260e228039295874bea024b629cb5a4d89a
author Chung-yih Wang <cywang@google.com> 1281067869 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1281067869 -0700

am e7b92260: am b9605886: Merge "Revert "Revert "Move SIP telephony related codes to framework.""" into gingerbread

Merge commit 'e7b92260e228039295874bea024b629cb5a4d89a'

* commit 'e7b92260e228039295874bea024b629cb5a4d89a':
  Revert "Revert "Move SIP telephony related codes to framework.""