| commit | bb88252119b7963c3baf4a2dcc5e1d87003affcf | [log] [tgz] |
|---|---|---|
| author | mike dooley <mdooley@google.com> | Fri Jan 30 21:16:18 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jan 30 21:16:18 2015 +0000 |
| tree | e265fef422ed0bccb4c4cc8c6377e87fc41a446a | |
| parent | 9ad2c5588ce833ccfa3d2afe09e3e19e261b4100 [diff] | |
| parent | f17a31c46db212cfbd31116b54f4b98ffd6b5ca7 [diff] |
am f17a31c4: Merge "Fixing conference managment regression." into lmp-mr1-dev * commit 'f17a31c46db212cfbd31116b54f4b98ffd6b5ca7': Fixing conference managment regression.