diff options
| author | Remi NGUYEN VAN <reminv@google.com> | 2021-02-26 03:22:03 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-26 03:22:03 +0000 |
| commit | 25a7767cc70df76a458aa1d0df13b0ed423a38ea (patch) | |
| tree | 82f49e45b73d05109ab93ae1d5647518cca3e397 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 5383d7a7767e9c67a75da9eb2f9ed1195075bea0 (diff) | |
| parent | 2c49d21ce1b21d1d00eb9cf0df703126208f0286 (diff) | |
Merge "Add public alternative for protectFromVpn" am: 2c49d21ce1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1605094
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I759af534bdf50f647351056275857c056998bf14
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions