diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-12-04 03:56:01 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-04 03:56:01 +0000 |
commit | 89a98351ee3eea2fe3ecb6f3b5fe77ac8083d81d (patch) | |
tree | 22de7e12b342825205b5ee1673745b91f98ec1ca /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 8f85ecd1f539898006cee952f043a26990e5780d (diff) | |
parent | c20770fee5178e56d5d2f80b5f8536977850a24a (diff) |
Merge "Remove NATT keepalive from IpSecTransform" am: c20770fee5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1512881
Change-Id: I6a0e26ee28e1b9bb0906c840826b7a9ddc88a818
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions