diff options
| author | 2023-03-07 16:08:17 +0000 | |
|---|---|---|
| committer | 2023-03-07 16:08:17 +0000 | |
| commit | 20948342359f77d45f1b623a609672e42dde172b (patch) | |
| tree | 03277a0c0a87cbb1634cd8f00e77c1ebe81a12d0 /libs/androidfw/StringPool.cpp | |
| parent | 51edb0f1818b873921bd632baa440f9d80d8112d (diff) | |
| parent | a414969b8273e41c635fb36c11051a5c0d5a85b9 (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: a414969b82 -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: Idf2cfdc8c55730d314090966ffe9f81112c8bafa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions