commit | 1453310967102ff604e8524da8db3a4f910c4462 | [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 | f055bbd34973a6e21a1780592c412b0a044d1ccb [diff] | |
parent | ef8a605c6ff35ea8d764d2ead326f4d8ac07617e [diff] |
Merge "Remove NATT keepalive from IpSecTransform" am: ef8a605c6f Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1512881 Change-Id: I6a0e26ee28e1b9bb0906c840826b7a9ddc88a818