diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2021-02-15 12:21:40 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-15 12:21:40 +0000 |
| commit | 8cec61d86f30e3946a59047bf4cb6a2f278a9d12 (patch) | |
| tree | 2fc13802921639078ff7f267c38c36c30a273921 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 0b263af1fe5fb7628e8038400f4e60170165cb87 (diff) | |
| parent | e322ecac2c79371b6155cfe840796b2857905260 (diff) | |
Merge "Rename getVpnLockdownWhitelist to -Allowlist" am: e322ecac2c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1580383
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1aca516555b1aea484aa962d1f538b3ae0eb9d4d
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions