tree 4b825dc642cb6eb9a060e54bf8d69288fbee4904
parent 955451552ff6d6b2e038361939da17d1b1c49564
parent 0569b1267fac14f2a9c5e65870f88af9115392ab
author Xin Li <delphij@google.com> 1673384184 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1673384184 +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: 0569b1267f -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: I18dd35b0120f4afcf182bbabd947acd5896a8336
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>