tree 4b825dc642cb6eb9a060e54bf8d69288fbee4904
parent 408b8c073e03e6710444ae50f9c609cd77e48c79
parent 69bf6a3e6325dfaf854c16f55b51833434167851
author Xin Li <delphij@google.com> 1660718019 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1660718019 +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: Idce1fc06018f31a8cdf1acdfa6534e00a1470e77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>