commit cc21f186f811784e8ad1f2033c835bd40c1eac55
author Neha Pattan <npattan@google.com> Wed Jan 18 23:05:23 2023 +0000
committer Neha Pattan <npattan@google.com> Thu Jan 19 00:56:27 2023 +0000
tree a1767ff5d14ac581ea0e9bdaf8cafe53aa02822e
parent 8f13a1e50be18b02586d79e379c60a8ed3889f4e

Merge privacysandbox/ads-adservices to androidx-main.

Relnote: Merge privacysandbox/ads-adservices to androidx-main.
Test: ./gradlew privacysandbox:ads:ads-adservices:connectedAndroidTest --info --daemon
Bug: b/265993958
Change-Id: Ie4f0e79312d50500611731b090e99cac943579d7

settings.gradle

diff --git a/settings.gradle b/settings.gradle
index 45819d9..4ffe586 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -795,6 +795,8 @@
 includeProject(":preference:preference", [BuildType.MAIN])
 includeProject(":preference:preference-ktx", [BuildType.MAIN])
 includeProject(":print:print", [BuildType.MAIN])
+includeProject(":privacysandbox:ads:ads-adservices", [BuildType.MAIN])
+includeProject(":privacysandbox:ads:ads-adservices-java", [BuildType.MAIN])
 includeProject(":privacysandbox:sdkruntime:sdkruntime-client", [BuildType.MAIN])
 includeProject(":privacysandbox:sdkruntime:sdkruntime-core", [BuildType.MAIN])
 includeProject(":privacysandbox:tools:tools", [BuildType.MAIN])