diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-05 00:38:40 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-05 00:38:40 +0000 |
| commit | 1de91c818bf1eaff691e23df6c2520c640351c20 (patch) | |
| tree | 32733b28b6e44672047307da031ad901b7234637 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 1b74411bc306aa9e3ea7d0c045f76b941deefd98 (diff) | |
| parent | 3dfffac9c8e7f3a1c136d0a9c8f7eb2f415e6d06 (diff) | |
[automerger skipped] Merge "Add separate user consent for Platform VPNs" am: ede31cad1c am: 7846b824e0 am: 3dfffac9c8 -s ours
am skip reason: Change-Id Ia6f36207d43c3748f938430c2780dcf29e5623f3 with SHA-1 418017e5f9 is in history
Change-Id: I7906d933b8e5e0a11d5ac800de9ef2c098323aaf
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions