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