| commit | dcbc4ceb632b511bd34ee884a3a822d9d7d4139a | [log] [tgz] |
|---|---|---|
| author | Dipankar Bhardwaj <dipankarb@google.com> | Mon Jul 11 18:20:03 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jul 11 18:20:03 2022 +0000 |
| tree | 07d2ae6b1b1cae856529654fb412df64fab49a0f | |
| parent | 731796bcfd7998dd76419481b332ea4a8faad1fc [diff] | |
| parent | dc5ff4820569d25cfe3921a1bf65510d5adb710f [diff] |
[automerger skipped] [conflict] DO NOT MERGE Avoid path traversal in MediaProvider delete call am: 47767be45f am: 0d7074e1d1 -s ours am: dc5ff48205 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/19198938 Change-Id: Ifca6f79becd5e7b838822189ea3eaf75db216344 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>