Skip to content
Commit 82058303 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove NATT keepalive from IpSecTransform" am: c20770fe am: 89a98351 am: 8397f75d 

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

Change-Id: I53320999a962c12f7cef9fe804616e62071fce1f
parents 7521f725 8397f75d
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment