commit | f17a31c46db212cfbd31116b54f4b98ffd6b5ca7 | [log] [tgz] |
---|---|---|
author | mike dooley <mdooley@google.com> | Fri Jan 30 19:48:17 2015 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Jan 30 19:48:18 2015 +0000 |
tree | e265fef422ed0bccb4c4cc8c6377e87fc41a446a | |
parent | 646fa3d6eaea71fb4c3270fde1a30eeb7c5e4288 [diff] | |
parent | bf9cd0e5f6b72668f84fe9e18373beca1086a238 [diff] |
Merge "Fixing conference managment regression." into lmp-mr1-dev