diff options
| author | Varun Anand <vaanand@google.com> | 2019-03-07 17:17:39 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-03-07 17:17:39 -0800 |
| commit | c06965571959e91eb8f06d0b79a844a8830ab0af (patch) | |
| tree | 86ad9f8ab05b18e7d19c1e02c218750c528f7c81 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | fd1672a52db773756cbcd5de8e0d4292096c213d (diff) | |
| parent | cf88c4d6573b3af05c52f7c7d5f76b419ccb61d5 (diff) | |
[automerger skipped] Merge "Revert "Update VPN capabilities when its underlying network set is null."" into pi-dev am: aa7b93b167 -s ours
am: cf88c4d657 -s ours
am skip reason: change_id Id0abc4d304bb096e92479a118168690ccce634ed with SHA1 4fa80e8a2f is in history
Change-Id: I0fe32cb678b7ee9b7ac79bd0efa4bdec3598ce8b
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions