tree 64ecfa12cdbebccc5add7efc44401cc429c1a302
parent 85b5f93bd24e7593cd427aad0b52673e4acbc578
parent 23c260ba23494c4f944287f0fb47a62a7686bc56
author Azhara Assanova <azharaa@google.com> 1704384395 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1704384395 +0000

Merge "Add feature flag for content URI permission APIs" into main am: 9fdbf8e5ac am: 23c260ba23

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

Change-Id: I56cf997f4827620766e2cca8e0d913a1061a2591
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>