| commit | 0f4d79ef15078729bdd6ae4d9259ca8e5f0382c1 | [log] [tgz] |
|---|---|---|
| author | Tyler Gunn <tgunn@google.com> | Thu Nov 20 21:24:12 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 20 21:24:12 2014 +0000 |
| tree | 685c5a6cd4b59ef88ce6c0c64860923eccb1a2e8 | |
| parent | 11d4a2d5336604120089a6754b5f392dda974254 [diff] | |
| parent | 45160d68648888d3e43f07387c00ce6c499527ce [diff] |
am 45160d68: Merge "Create IMSConference to represent IMS conference calls." into lmp-mr1-dev automerge: 9c1749e * commit '45160d68648888d3e43f07387c00ce6c499527ce': Create IMSConference to represent IMS conference calls.