[automerger skipped] [conflict] Prevent sharesheet from previewing unowned URIs am: 3062b80fb2 am: b4f4ac8e45 am: f4b4fbea82 am: 1b3b97d91c -s ours am: 648b08d362 -s ours am: d1780ebee0 -s ours am: 4511115ce0 -s ours

Browse Source

am skip reason: Merged-In I582bacca197d814204b48b917a550f72dbde87d6 with SHA-1 e66544a48f is already in history

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

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

...

This commit is contained in:

Mark Renouf

2023-03-14 16:42:59 +00:00

committed by Automerger Merge Worker

parent 862a5466d2 4511115ce0

commit ded93e3405

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available