tree 7376a698739fd250c5f316b60cba577cf1647c19
parent 2766d615e6034c074d6a52d97505bf554099c601
parent 8637acec9dab1ad66bb177f57802d672b17c8ceb
author Lorenzo Colitti <lorenzo@google.com> 1613442249 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1613442249 +0000

[automerger skipped] Merge "Rename getVpnLockdownWhitelist to -Allowlist" am: deae737952 am: 69f3b6bd3c am: 8637acec9d -s ours

am skip reason: Change-Id Id02a37624655c4ff88744c9c57af9f2a17953667 with SHA-1 ab9f06ebe0 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I514aaf1a583bfd76d5bc32e14d1bc0f684131c51