| commit | 7c5d14c1bfa24b69061d4ee276a53d00fc05897c | [log] [tgz] |
|---|---|---|
| author | Andrew Lee <anwlee@google.com> | Mon Aug 25 08:22:00 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 25 08:22:00 2014 +0000 |
| tree | 1fa9de8775e0354eb4cf9200f119bbfdb77de1d0 | |
| parent | 4324226eeae1e12f5620c7532af4de6e60eb62ec [diff] | |
| parent | 07b5337bc113f8f6cbb82911b7e7abace1a69db9 [diff] |
am 9f960da9: am b344cb8f: am ac9fc1c8: Merge "Minor string update to manage conference description." into lmp-dev * commit '9f960da91e45d9e7fe913dba4981e3e5a24eb0e0': Minor string update to manage conference description.