Hung-ying Tyan dc7d73783e am 8eac20ea: SIP: implement conference call ...

Merge commit '8eac20eacd088793547c56e14d602b28d62fb278' into gingerbread-plus-aosp

* commit '8eac20eacd088793547c56e14d602b28d62fb278':
  SIP: implement conference call

2010-08-18 13:37:25 -07:00

..

android/telephony

am 3f442ece: Merge "Fix character count bug and Javadoc typos in SMS (with test cases)" into gingerbread

2010-08-13 15:19:11 -07:00

com/android/internal/telephony

am 8eac20ea: SIP: implement conference call

2010-08-18 13:37:25 -07:00