OSDN Git Service

am 655f02a4: am 48cc36d9: Merge "Added SIP Demo to sample apps." into gingerbread
authorAlexander Lucas <alexlucas@google.com>
Thu, 4 Nov 2010 14:20:40 +0000 (07:20 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 4 Nov 2010 14:20:40 +0000 (07:20 -0700)
* commit '655f02a45669ce3b03d96cd8634bfe3745b6f725':
  Added SIP Demo to sample apps.

1  2 
build/sdk.atree

diff --cc build/sdk.atree
Simple merge