tree 001ca3325570e7430db5cfb8b37a85311491155f
parent ce8c623fbe826ce7950bf5599a44fff0761ed660
parent 0a2972886b2663f96b028c9172146a52c3256625
author Xin Li <delphij@google.com> 1673306862 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1673306862 +0000

[automerger skipped] Merge Android 12 QPR 3 am: 3dd71cd1d7 -s ours am: b7edf74668 -s ours am: 375f4466c1 -s ours am: b81c1b0d9f -s ours am: 0a2972886b -s ours

am skip reason: Merged-In Idde105d06c394cb00c135969288dd2ec45f7cea4 with SHA-1 ec71f3f5eb is already in history

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

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