tree 001ca3325570e7430db5cfb8b37a85311491155f
parent 8a08487be26e884581dbb8c055009d4c98008f42
parent ed31619b42fa9f0326d4ad5c33dd45d913e9bf8d
author Xin Li <delphij@google.com> 1673313675 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1673313675 +0000

[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: cab76eeaa3 -s ours am: 0bd88bc883 -s ours am: 42026683c6 -s ours am: ed31619b42 -s ours

am skip reason: Merged-In Idefa84f401ed0882ee1a3b799bb66c665174a641 with SHA-1 010d20bab3 is already in history

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

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