diff options
| author | Remi NGUYEN VAN <reminv@google.com> | 2021-03-01 08:01:51 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-01 08:01:51 +0000 |
| commit | 7cf726658c84eed1e58efca44e11e50fe4ff839d (patch) | |
| tree | 067962024aef73be8324de130ba1e96eca820d8d /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 71f07b4ed5be490508fe4453f4fccb903689f8aa (diff) | |
| parent | e456ac20611d2a92cb2614ad22b420c9757e3bda (diff) | |
Merge "Add public alternative for protectFromVpn" am: 2c49d21ce1 am: 25a7767cc7 am: e456ac2061
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1605094
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If0c46c990def1b6884a6008841f3d5bd912b8650
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions