diff options
| author | Bernie Innocenti <codewiz@google.com> | 2018-07-13 09:17:40 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-07-13 09:17:40 -0700 |
| commit | d1f53d13a9d2b22fc2e7573b1b05d8ae9fc56126 (patch) | |
| tree | 69bd85f4259c55d778301a3d677d019cc4593b71 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 262d6935a0595ef52c116738f084dfcfa44308fb (diff) | |
| parent | 8f1c70e49b9553e604ea2d4ae14eb7d162263c51 (diff) | |
Merge "vpn: allow IPSec traffic through Always-on VPN" into oc-dev
am: 8f1c70e49b
Change-Id: Ic103dfa909ca4567a815b16f0794baf74c1cf068
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions