| commit | dc5ff4820569d25cfe3921a1bf65510d5adb710f | [log] [tgz] |
|---|---|---|
| author | Dipankar Bhardwaj <dipankarb@google.com> | Mon Jul 11 17:53:44 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jul 11 17:53:44 2022 +0000 |
| tree | 03520b6d60f8a66f2e9412668fb9036b83ce1ebd | |
| parent | e25b79389f32196ed21b43c9a7025e7c2a212df9 [diff] | |
| parent | 0d7074e1d1131e4acb27ee92733e93bb236fa414 [diff] |
[automerger skipped] [conflict] DO NOT MERGE Avoid path traversal in MediaProvider delete call am: 47767be45f am: 0d7074e1d1 -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: I539d58b3bdce6433f06a3a983a93e056d3db9af5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>