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