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

Browse Source

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

...

This commit is contained in:

Lorenzo Colitti

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

committed by Automerger Merge Worker

parent 2766d615e6 8637acec9d

commit b06b6d5401

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