| commit | 6c3e97da87cfa14da82efb219365063b9b31fd95 | [log] [tgz] |
|---|---|---|
| author | Lorenzo Colitti <lorenzo@google.com> | Tue Feb 16 02:24:09 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Feb 16 02:24:09 2021 +0000 |
| tree | fbea39515f16a1254fb13d402350cde70b190b8c | |
| parent | 03c6423fb2f03042d5477fbd49d6485637c3cf36 [diff] | |
| parent | 5c1c7780ac59bdd217e449565f7f4942c7422d7f [diff] |
[automerger skipped] Merge "Rename getVpnLockdownWhitelist to -Allowlist" am: 4e846daeae am: 5c1c7780ac am: b79cddd608 -s ours am skip reason: Change-Id Id02a37624655c4ff88744c9c57af9f2a17953667 with SHA-1 ba26988b1c is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1580383 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I514aaf1a583bfd76d5bc32e14d1bc0f684131c51