| commit | a56fa73c30b4756068fbb6578668e39fb2f5c235 | [log] [tgz] |
|---|---|---|
| author | Andrew Lee <anwlee@google.com> | Fri Nov 07 02:04:30 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 07 02:04:30 2014 +0000 |
| tree | 0cb7b3677468ca597606b4bbfac0ec1f5bdce59b | |
| parent | 675a0b6bc9ee2f2e80f28381c0f34d98e0447ad6 [diff] | |
| parent | 8f34e65afc020df064d0703633cb1f875bfc4fe8 [diff] |
am 8f34e65a: am a70688f2: Merge "Replace onConferenceChanged with onConnectionAdded." into lmp-mr1-dev * commit '8f34e65afc020df064d0703633cb1f875bfc4fe8': Replace onConferenceChanged with onConnectionAdded.