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