tree 67e1874122b2fc1ba99cfdab30e2afb93efa188b
parent 8b7300aea22aaddc0631ec88ce9acea3f2f95d3a
parent 8a12b93b5f1f0d5fedec939fae40532b81e363e4
author Nate Myren <ntmyren@google.com> 1694714827 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1694714827 +0000

[automerger skipped] Merge "Store trusted AttributionSources without token" into udc-dev am: f0ebf50841 am: 09e8508661 -s ours am: 8a12b93b5f -s ours

am skip reason: Merged-In I5731ceeab5b9d0c72ce0131e2c9ba2f74558218c with SHA-1 670a363dc9 is already in history

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

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