| commit | 1c66bfb37edd9531c97ba2851338d521be73122c | [log] [tgz] |
|---|---|---|
| author | Hung-ying Tyan <tyanh@google.com> | Wed Aug 18 14:20:49 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 18 14:20:49 2010 -0700 |
| tree | 955a220ad4e3a7fbfe5992e4c784cbc62fdf49cb | |
| parent | 38311b33c89fd570e238e21dcecf6dd5ccd5726c [diff] | |
| parent | dc7d73783e0416cbfde6053a037ce32c8f35fbc4 [diff] |
am dc7d7378: am 8eac20ea: SIP: implement conference call Merge commit 'dc7d73783e0416cbfde6053a037ce32c8f35fbc4' * commit 'dc7d73783e0416cbfde6053a037ce32c8f35fbc4': SIP: implement conference call