| commit | 20ed035251a3fa4d7cab63a672aeaf2f3160a492 | [log] [tgz] |
|---|---|---|
| author | Santos Cordon <santoscordon@google.com> | Tue Jun 10 18:05:31 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 10 18:05:31 2014 +0000 |
| tree | 72beb1c16530d8983a410e285783731827d0b4fc | |
| parent | 7c65acd2d2201fab6ea35f331baa1ea9bc04ee96 [diff] | |
| parent | 6a405e029d78938c54391a562d44ccbc339f81fb [diff] |
am 6a405e02: (-s ours) Support conference calling. (2/4) [DO NOT MERGE] * commit '6a405e029d78938c54391a562d44ccbc339f81fb': Support conference calling. (2/4) [DO NOT MERGE]