tree 32906d8dfcca3f147dfd0473e07bc6ebc3c51f29
parent 51732a8d91c961ac290a1dd277ed2585c85e78de
parent bab17828680542ea2e6df2b19f44af1e3ccc58e1
author Benedict Wong <benedictwong@google.com> 1592242413 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1592242413 +0000

Merge "Set correct owner UID for VPN agentConnect()" am: 2f7bb517fd am: bab1782868

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

Change-Id: I5ff673d97fe4558da77575b2cc8c43b87e3673f6