tree c3479f7c2ce25a4c8fb5fe53c87d16a48c340865
parent bfd81af9ef34f0a693098ad2c4dc0a9d57cda6af
parent 347f56c83667ec39b58cd6ec0c48b3c6c4cadc3f
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1579804084 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1579804084 +0000

Merge "Add list of Administrator UIDs to NetworkCapabilities." am: 452ccae317 am: 347f56c836

Change-Id: I1636f33bf5667442ee9a0b9d463e1ce4bcb2b737