| commit | d1780ebee0e14e8c0c66acbf343fdaf488f1afd8 | [log] [tgz] |
|---|---|---|
| author | Mark Renouf <mrenouf@google.com> | Mon Mar 06 15:23:12 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Mar 06 15:23:12 2023 +0000 |
| tree | e6a5bd72223f256ba2cb72c076f5f5ef2368bb3d | |
| parent | b7e5c1617b6567bbf0635038831f2a4629597e77 [diff] | |
| parent | 648b08d36281fd6c79449cb0fbbb7e4f943d7655 [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 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: I2a38dbc5b350909abf3faaf22d9e64084228085b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>