diff options
| author | 2023-03-04 22:27:03 +0000 | |
|---|---|---|
| committer | 2023-03-04 22:27:03 +0000 | |
| commit | 648b08d36281fd6c79449cb0fbbb7e4f943d7655 (patch) | |
| tree | dfd019ce45fd0ae7b6d3e9c106ffca122db574f5 /libs/androidfw/StringPool.cpp | |
| parent | b03c904b97a104a939f2422de5f2ca7c06ba315a (diff) | |
| parent | 1b3b97d91cbe7928a3f143cdaab9a7919041063a (diff) | |
[automerger skipped] [conflict] Prevent sharesheet from previewing unowned URIs am: 3062b80fb2 am: b4f4ac8e45 am: f4b4fbea82 am: 1b3b97d91c -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: I5814214b92bff9e7418a7b0b03a636eba26b5ee9
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