tree 7fd6ddf6abe3d01a02118e3b676b1c3a3fe22006
parent dcdf055539220663d5667242afd927ee7f9bb151
parent 3a4638ff0900f5dc5c797a022ad271e3805b1fd9
author Benedict Wong <benedictwong@google.com> 1647655481 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1647655481 +0000

Merge "Allow sending of Administrator UIDs for *NETWORK_STACK" am: 0e75662808 am: 3a4638ff09

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

Change-Id: If43ee066ef7ccb34391d984d629fb26d1e111ea9