tree e7510b13205a050a55d93d4dc81b33f27981d627
parent 334840054f5da027c498636b2b3269806e1fe592
parent 4733c0888b676189aee2cdf1ec44674264a32682
author Anthony Lee <anthonylee@google.com> 1435862028 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1435862041 +0000

Merge "Set "has no children" capability on IMS conferences." into mnc-dev