| commit | e57e8e658aa39f9f200e5998710705bdc8cc9efc | [log] [tgz] |
|---|---|---|
| author | Andrew Lee <anwlee@google.com> | Fri Nov 07 04:17:56 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 07 04:17:56 2014 +0000 |
| tree | 08e48608bca758de0ac40c59044bb3c4de212470 | |
| parent | c5f9ec3e271aa34a38497db8152f13dcb29b70f5 [diff] | |
| parent | a56fa73c30b4756068fbb6578668e39fb2f5c235 [diff] |
am a56fa73c: am 8f34e65a: am a70688f2: Merge "Replace onConferenceChanged with onConnectionAdded." into lmp-mr1-dev * commit 'a56fa73c30b4756068fbb6578668e39fb2f5c235': Replace onConferenceChanged with onConnectionAdded.