tree 22de7e12b342825205b5ee1673745b91f98ec1ca
parent 8f85ecd1f539898006cee952f043a26990e5780d
parent c20770fee5178e56d5d2f80b5f8536977850a24a
author Treehugger Robot <treehugger-gerrit@google.com> 1607054161 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1607054161 +0000

Merge "Remove NATT keepalive from IpSecTransform" am: c20770fee5

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1512881

Change-Id: I6a0e26ee28e1b9bb0906c840826b7a9ddc88a818