| commit | 8bb0aed6923a1eee3ed5bcb5c97e401da0bfdd2f | [log] [tgz] |
|---|---|---|
| author | Tyler Gunn <tgunn@google.com> | Wed Nov 05 18:51:15 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 05 18:51:15 2014 +0000 |
| tree | 862d77c7232a5374c997c61381b107e9ecb1af0e | |
| parent | 6d5cacba0bc78625e232622c44c1f2f05feaf48a [diff] | |
| parent | 573e18569a4293a523e14e6185f22f2ec33c6abc [diff] |
am 638ce6d3: am 3e9579c6: Merge "Fixing conference participant bug." into lmp-mr1-dev * commit '638ce6d3482500cd674e58c9b8254b4842052f07': Fixing conference participant bug.