| commit | a414969b8273e41c635fb36c11051a5c0d5a85b9 | [log] [tgz] |
|---|---|---|
| author | Mark Renouf <mrenouf@google.com> | Tue Mar 07 15:11:16 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Mar 07 15:11:16 2023 +0000 |
| tree | f9a02612c1080423e11a7202e6d76bd99d375ed5 | |
| parent | 6690e6a6c284d9bb02b10dc1e1197462e68f4097 [diff] | |
| parent | d1780ebee0e14e8c0c66acbf343fdaf488f1afd8 [diff] |
[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 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: Ic2a2ec50af729df057cff542f37a31d820baf138 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>