diff options
| author | Bernie Innocenti <codewiz@google.com> | 2018-07-13 06:38:01 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-07-13 06:38:01 -0700 |
| commit | bd94183537db3dc1808291848b48a67d1cd644d2 (patch) | |
| tree | ea37a61ec2f1e97a63bef9e539280d3c91d30fae /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | ca8a8a999b271c65148e70970f6dda4389b8e458 (diff) | |
| parent | cf164db36fe350f02d7df3158666569d97662780 (diff) | |
[automerger skipped] Merge "vpn: allow IPSec traffic through Always-on VPN" into pi-dev am: 903d59735e -s ours
am: cf164db36f -s ours
Change-Id: I6b12b39093e3777994c3f074ec1de5294f967487
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions