tree 001ca3325570e7430db5cfb8b37a85311491155f
parent 0569b1267fac14f2a9c5e65870f88af9115392ab
parent 69bf6a3e6325dfaf854c16f55b51833434167851
author Xin Li <delphij@google.com> 1673320815 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1673320815 +0000

[automerger skipped] DO NOT MERGE - Merge Android 13 am: cd66ffa218 -s ours am: 9465f1fec4 -s ours am: 268a5409d5 -s ours am: 69bf6a3e63 -s ours

am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkPermissionConfig/+/2186427

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