diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-05 00:24:10 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-05 00:24:10 +0000 |
| commit | 3dfffac9c8e7f3a1c136d0a9c8f7eb2f415e6d06 (patch) | |
| tree | e9f82d4de50ba6cdaa5080ed9b7afdbc8993896a /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 8c8286f8d5aed2e19a39e0b17fe221aca244f2b1 (diff) | |
| parent | 7846b824e0e2ed1bffdd486374e7930c0c13d53f (diff) | |
Merge "Add separate user consent for Platform VPNs" am: ede31cad1c am: 7846b824e0
Change-Id: If2d856c62b77da4bc8ea99335b1e89170f24fbca
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions