| commit | 5c1c7780ac59bdd217e449565f7f4942c7422d7f | [log] [tgz] |
|---|---|---|
| author | Lorenzo Colitti <lorenzo@google.com> | Mon Feb 15 12:21:40 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Feb 15 12:21:40 2021 +0000 |
| tree | 784dfe7a17e1c20c33aac7136e9510478e5631cd | |
| parent | 6e69ea851c9a270e2e90f58c3caa75935bfe2a22 [diff] | |
| parent | 4e846daeae1145a3478de789d40bc514fee7d777 [diff] |
Merge "Rename getVpnLockdownWhitelist to -Allowlist" am: 4e846daeae Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1580383 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I1aca516555b1aea484aa962d1f538b3ae0eb9d4d