diff options
| author | Bernie Innocenti <codewiz@google.com> | 2018-06-04 23:17:55 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-06-04 23:17:55 -0700 |
| commit | 08f862a015e0b1f4768356511de50832c325d314 (patch) | |
| tree | 07db9b1a371987c383bfc5692e09fca6edeb2151 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 1122f2c6bbce16e294511565bd8a88f8017a834f (diff) | |
| parent | b1c9efc6fa1f5fb660ccf22b0fb097481016de32 (diff) | |
Merge "vpn: allow IPSec traffic through Always-on VPN" am: 4d3b5c1d3b am: 254f08bc70
am: b1c9efc6fa
Change-Id: I1f9b78c8f828ec2df7aba71b39d62be0c4db2550
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions