tree 4ebcdc8bb181900d1814f03802349bff4940523c
parent bff26f4bf1ba5ad084f52174528d423ae71724fa
parent ed839943e08c956ddd3fb74941e45bbb59343c8c
author Brad Ebinger <breadley@google.com> 1486419026 +0000
committer android-build-merger <android-build-merger@google.com> 1486419026 +0000

Merge "Framework fixes to support VoLTE conf calls via RemoteConnectionServices."
am: ed839943e0

Change-Id: Ib8ed5dbf927300503aba1d97af25703b380c56a4