| commit | f7d8e1e463364c386d9b939902884b7757116c98 | [log] [tgz] |
|---|---|---|
| author | Lorenzo Colitti <lorenzo@google.com> | Tue Feb 16 02:50:31 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Feb 16 02:50:31 2021 +0000 |
| tree | 233071373606fecf87edf2bb120857aaacab807b | |
| parent | 300650b6a2e1c6551a2e89d552618fed6c3a2817 [diff] | |
| parent | 96551cdce4c1304aad7c267555355ea69f0997a1 [diff] |
[automerger skipped] Merge "Rename getVpnLockdownWhitelist to -Allowlist" am: e322ecac2c am: 8cec61d86f am: b79cddd608 -s ours am: 96551cdce4 -s ours 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: Ib59426962232c26855c50e074606de14af8419e8