| commit | 573e18569a4293a523e14e6185f22f2ec33c6abc | [log] [tgz] |
|---|---|---|
| author | Tyler Gunn <tgunn@google.com> | Wed Nov 05 18:43:24 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 05 18:43:24 2014 +0000 |
| tree | 0544c08037c7e02e8a3886b49d93198ae7553071 | |
| parent | 99f0e086217d506de7f744673163f60d506061aa [diff] | |
| parent | 662626ec0a406066a698635bc746246db76ec81c [diff] |
am 3e9579c6: Merge "Fixing conference participant bug." into lmp-mr1-dev * commit '3e9579c63e16472804c69dd36ce5386da673497f': Fixing conference participant bug.