tree 099de02f30b1ddb6f6ef7158b3c7abc060aaaa6f
parent 4cb81c01b247ddc52dead54c9c6e99540e0d7a34
parent 211a28eaae500a4ef09689f39ddd7a60556b6035
author Alexander Lucas <alexlucas@google.com> 1288823729 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1288823729 -0700

am 6f4a084e: Merge "Added SIP Demo" into gingerbread

* commit '6f4a084e33c917b7e04309a4296404aef7325fca':
  Added SIP Demo