diff options
| author | Benedict Wong <benedictwong@google.com> | 2018-11-26 03:04:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-11-26 03:04:16 +0000 |
| commit | f928c1e4b9121d9b65dbcdd7932f1ffff25bffc3 (patch) | |
| tree | 26a7c98b7201c914bd249fee6dcd06921c95789f /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 1c66fd2d677ce749dfddfba93c15305d6eca89ee (diff) | |
| parent | b29205728283e260893f48fcef6263369f2f0949 (diff) | |
Merge changes from topic "xfrmi-support"
* changes:
Cleanup and update comments SA mark disabling comments
Add XFRM-I support to IpSecService
Disable attempted updating of SA marks
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions