commit | 60f25d0f8a2efe6807ca11ed56e5525f9f0bfe8b | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Fri Dec 04 03:56:01 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Dec 04 03:56:01 2020 +0000 |
tree | 0bb237c7ff0095f2991f3fb8ffe0c7f0762e41db | |
parent | d2d415b7c53d4b22c45143d042f39faec44423c2 [diff] | |
parent | c6c45cf676a7dfcb6b46a6b91f3b714768267b37 [diff] |
Merge "Remove NATT keepalive from IpSecTransform" am: c6c45cf676 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1512881 Change-Id: I6a0e26ee28e1b9bb0906c840826b7a9ddc88a818