[automerger skipped] Merge "Rename getVpnLockdownWhitelist to -Allowlist" am: e322ecac2c am: 8cec61d86f am: b79cddd608 -s ours

Browse Source

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I514aaf1a583bfd76d5bc32e14d1bc0f684131c51

...

This commit is contained in:

Lorenzo Colitti

2021-02-16 02:24:09 +00:00

committed by Automerger Merge Worker

parent 156f824ad2 b79cddd608

commit 96551cdce4

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available