| commit | 8f34e65afc020df064d0703633cb1f875bfc4fe8 | [log] [tgz] |
|---|---|---|
| author | Andrew Lee <anwlee@google.com> | Fri Nov 07 01:58:35 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 07 01:58:35 2014 +0000 |
| tree | 749ace04a896df6d21a0df1d18e0eee7158be66f | |
| parent | 513aa79290dd17400c4cce82d1d801c05ff3776f [diff] | |
| parent | a70688f2a5d2e90b3806709e32cb8de2057f5e39 [diff] |
am a70688f2: Merge "Replace onConferenceChanged with onConnectionAdded." into lmp-mr1-dev * commit 'a70688f2a5d2e90b3806709e32cb8de2057f5e39': Replace onConferenceChanged with onConnectionAdded.