| commit | 087d1c6462b3f474cf9f7011fb30fb6c7ac400cd | [log] [tgz] |
|---|---|---|
| author | Tyler Gunn <tgunn@google.com> | Wed Nov 05 18:56:44 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 05 18:56:44 2014 +0000 |
| tree | 1b8748271bac408d2ff8d8c2609a8fdc304bda99 | |
| parent | 5e880e2e2c0a366a82a094ba957eae01f4bfd9ce [diff] | |
| parent | 8bb0aed6923a1eee3ed5bcb5c97e401da0bfdd2f [diff] |
am 9b18a9b0: am 638ce6d3: am 3e9579c6: Merge "Fixing conference participant bug." into lmp-mr1-dev * commit '9b18a9b02883cb49998634a852af0b15c64445bc': Fixing conference participant bug.