tree f349f9afcff71efb5999e90dae714262be0875fc
parent 96f21fd65f265747ba20c1efd521e9541ae2db2f
parent 69f3b6bd3cf3e21a9ff698b908f4da919ed4039e
author Lorenzo Colitti <lorenzo@google.com> 1613392476 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1613392476 +0000

Merge "Rename getVpnLockdownWhitelist to -Allowlist" am: deae737952 am: 69f3b6bd3c

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2a6a2442a6dffe85c6d9f4783438b4a07865fd05