tree 5afaf27a475f25174c3f85ab7823ddfb418acf26
parent a46578443150b1a1b79e50139c6a2af815c603a0
parent df27db3f0b0b808d97360127d8a39db1df4f6b3e
author TreeHugger Robot <treehugger-gerrit@google.com> 1606979216 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1606979216 +0000

[automerger skipped] Merge "Revoke the uri permission when the file is deleted" into pi-dev am: 2b52397d56 am: 9095b67c84 am: 78c8bbdfaf -s ours am: df27db3f0b -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/+/12455472

Change-Id: Ief17a8d88de5abc16e2854b9981f5c059cbaa6d7