Brad Ebinger d9e4faebe8 Merge "[RCS UCE] Expose the OPTIONS APIs to support OPTIONS mechanism" am: c7baa4862f am: cd59a1a0f3 am: abfa62f80b ...

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6780e5f6a10924f4b445fb100535961b3272166f

2021-02-17 22:28:02 +00:00

..

android

Merge "[RCS UCE] Expose the OPTIONS APIs to support OPTIONS mechanism" am: c7baa4862f am: cd59a1a0f3 am: abfa62f80b

2021-02-17 22:28:02 +00:00

com/android

Merge "Change config_bandwidthEstimateSource to bandwidth_estimator" into sc-dev

2021-02-17 21:14:07 +00:00