tree 2c5bfa552706f8bc8b5a694d37513958283dbcd9
parent 112efa8a5a3de8d81842fbd9540c6cc1b38ceb6d
parent 73c476d79d4c1d9e631d854e83a1672997c6f31c
author Frank Li <lifr@google.com> 1647435279 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1647435279 +0000

Merge "[DU04-2]Appropriate changes to the NetworkPolicyManager API" am: 73c476d79d

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2007132

Change-Id: I95ac7442751dca1f4e469edbe950b38aca6c720a