tree 4b825dc642cb6eb9a060e54bf8d69288fbee4904
parent 241609aa407fa864e825f78da91873a08cc1f1ea
parent ee28e0199913cfc0ee72907ef97266691eda9337
author Xin Li <delphij@google.com> 1673405291 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1673405291 +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: ee28e01999 -s ours

am skip reason: subject contains skip directive

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

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