tree b6c0ccfaa6e485363ed7f1d0fe822b0914590aa9
parent d3467070fc4118cf70d4c6af8de53363fb91ea09
parent 8ebbe3c0382c6ff6a803cc878bed1e41a3ae9542
author Treehugger Robot <treehugger-gerrit@google.com> 1595956846 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1595956846 +0000

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

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

Change-Id: Ie318c734d41d8b671de4c6bd6d55ca3c8bbb8dea