tree bae691b424a0709f4481b7f850c7710d3086102b
parent 429b89bab933f1563a38ce4a88580f8dba1fb9ef
parent db5281558a9fe09cfa7081c1591fc2b3c9daaea5
author Miranda Kephart <mkephart@google.com> 1686945433 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1686945433 +0000

[automerger skipped] Merge "[DO NOT MERGE] Update quickshare intent rather than recreating" into sc-qpr1-dev am: db5281558a -s ours

am skip reason: subject contains skip directive

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

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