tree c776ec1c7a5268aa5a195457601e268d738587ce
parent 8ffac53a67ee494aee27e8d0e271112f485907e9
parent 3a165ca97f7f829a6ddc25de97f6e8cd89f89416
author Xin Li <delphij@google.com> 1702329405 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1702329405 +0000

[automerger skipped] Merge Android 14 QPR1 am: 3a165ca97f -s ours

am skip reason: Merged-In Id5533161114d7ffef1e720986534f04d690a682e with SHA-1 8ffac53a67 is already in history

Original change: https://android-review.googlesource.com/c/platform/prebuilts/module_sdk/AdServices/+/2866398

Change-Id: Ib601cc11a01797f7b55e82ccdddcac609ac5ab54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>