tree 708302ad38558c6b8bc268ee2a9119d871178cf3
parent 934a45dd19811f628dbd387c7e9d6c8cc7ccee2b
parent 83f171da21a61417a82fda75b779797570eebba2
author Hall Liu <hallliu@google.com> 1528860958 -0700
committer android-build-merger <android-build-merger@google.com> 1528860958 -0700

Merge "Mark RTT calls as non-conferenceable"
am: 83f171da21

Change-Id: I4524b5c6a153b9346363130a89f495b6f2a46dce