summaryrefslogtreecommitdiffstats
path: root/telecomm/java/android/telecom/ParcelableConference.java
Commit message (Expand)AuthorAgeFilesLines
* resolve merge conflicts of edc625f to m-wireless-dev.Andrew Lee2015-04-161-14/+13
|\
| * Add StatusHints to Conference object.Andrew Lee2015-04-151-13/+13
* | Fix incorrect Conference time for IMS conference calls.Tyler Gunn2015-04-161-1/+1
* | IMS-VT: Upgrade/Downgrade changeRekha Kumar2015-04-011-3/+31
|/
* Fix for call timer resetting when starting IMS conference call. 1/4Tyler Gunn2015-01-121-1/+22
* Telecom API updates (1/6)Ihab Awad2014-11-281-7/+7
* Renaming Telecomm to Telecom.Tyler Gunn2014-09-121-0/+111