| commit | 0f29d703f5cb7457022e2ef26fcb8be018957646 | [log] [tgz] |
|---|---|---|
| author | Anthony Lee <anthonylee@google.com> | Thu Jul 02 18:44:24 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jul 02 18:44:24 2015 +0000 |
| tree | 6cce6ebc8209fa68d600f295607a1da596227a12 | |
| parent | 3c2452174dcd736f684d94fd737e34c69f3a9c6f [diff] | |
| parent | 2cbe1cfb2a56b89fd6eca821aece13a81d9c9c84 [diff] |
am 2cbe1cfb: Merge "Set "has no children" capability on IMS conferences." into mnc-dev * commit '2cbe1cfb2a56b89fd6eca821aece13a81d9c9c84': Set "has no children" capability on IMS conferences.