| commit | 8dae3dddcfda490526c6a9aa24df9a4ed5f04e3a | [log] [tgz] |
|---|---|---|
| author | mike dooley <mdooley@google.com> | Fri Jan 30 21:22:43 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jan 30 21:22:43 2015 +0000 |
| tree | 191c29dc57c794db19ddb82efd418100cc7a5492 | |
| parent | 463dbd823955234aff4c7dd55c5feb941278f1db [diff] | |
| parent | bb88252119b7963c3baf4a2dcc5e1d87003affcf [diff] |
am bb882521: am f17a31c4: Merge "Fixing conference managment regression." into lmp-mr1-dev * commit 'bb88252119b7963c3baf4a2dcc5e1d87003affcf': Fixing conference managment regression.