Skip to content
Commit 96551cdc authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "Rename getVpnLockdownWhitelist to -Allowlist" am:... 

[automerger skipped] Merge "Rename getVpnLockdownWhitelist to -Allowlist" am: e322ecac am: 8cec61d8 am: b79cddd6 -s ours

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I514aaf1a583bfd76d5bc32e14d1bc0f684131c51
parents 156f824a b79cddd6
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment