tree db7fd4d2bf065095ff4b92cff3130b895df0ae25
parent b6f5a11a01e19313c6be7264064982f8016a7621
parent f727da6c41eb9977a08d76cfd6aabf51cc474177
author TreeHugger Robot <treehugger-gerrit@google.com> 1606991069 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1606991069 +0000

[automerger skipped] Merge "Revoke the uri permission when the file is deleted" into qt-dev am: e1379873de -s ours am: abb1571955 -s ours am: 56fe6ed016 -s ours am: 8bfc1dddde -s ours am: f727da6c41 -s ours

am skip reason: Change-Id I4ffb183630aadb2d87b0965e8cecf88af15f4534 with SHA-1 2c80a71789 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12455546

Change-Id: I0043bbef95ef51150ca954824e2a9816f8257c70