tree 5aaf8a24124400d9923a24e9067ee12a80dd6956
parent 6990836dae0bc823aa6248449b67ef5c2a603607
parent bb50f0e74c9394936bbc298ea8e089b7b236c67d
author Treehugger Robot <treehugger-gerrit@google.com> 1595960450 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1595960450 +0000

Merge "Expose adhoc conference calling API as public." am: 8ebbe3c038 am: fb8f41f0c2 am: e8a4750ac5 am: bb50f0e74c

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1368819

Change-Id: I3c1ba14ebf107ca37baa0c254be72ef3e0e755c1