tree 4a9594d7e22830b8c483047cf7893ead739c1eb3
parent 406c383aa1a6bf07de1fa1571a15474e8b265e35
parent 21ef11a7dd449454594044304683166c4534de52
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1580863120 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1580863120 +0000

[automerger skipped] Merge "Add separate user consent for Platform VPNs" am: e2684df6ef am: 05a3496121 am: 21ef11a7dd -s ours
am skip reason: Change-Id Ia6f36207d43c3748f938430c2780dcf29e5623f3 with SHA-1 5cb7ef9f08 is in history

Change-Id: I7906d933b8e5e0a11d5ac800de9ef2c098323aaf