diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2021-02-16 02:24:09 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-16 02:24:09 +0000 |
| commit | 96551cdce4c1304aad7c267555355ea69f0997a1 (patch) | |
| tree | 73b3ae9c5d9ccf3fca2051299f2d5c9fc5737acf /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 156f824ad2369bbc905079945430fbd425083986 (diff) | |
| parent | b79cddd608073b6c4ea93b9e970692d9ea5599c3 (diff) | |
[automerger skipped] Merge "Rename getVpnLockdownWhitelist to -Allowlist" am: e322ecac2c am: 8cec61d86f am: b79cddd608 -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: I514aaf1a583bfd76d5bc32e14d1bc0f684131c51
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions