| commit | aec33e66acbcf83a58b0e7af14c6330f48063bf8 | [log] [tgz] |
|---|---|---|
| author | Andrew Lee <anwlee@google.com> | Tue Oct 21 21:39:30 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 21 21:39:30 2014 +0000 |
| tree | 5a924be5f4ff498e6e1b29a52efdbabd573dd49c | |
| parent | 0a76c47e7134a10d9aa61d27e7b9f99569ed20da [diff] | |
| parent | cd90d42d9d6e56c8180fd621f0c9afda297291d5 [diff] |
am cd90d42d: am 017c6f2d: Merge "Fire onConferenceChanged after reseting conference." into lmp-mr1-dev * commit 'cd90d42d9d6e56c8180fd621f0c9afda297291d5': Fire onConferenceChanged after reseting conference.