commit | 702c455baeda7c3dcd1131056096bca358727c67 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Fri Dec 04 04:12:38 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Dec 04 04:12:38 2020 +0000 |
tree | 0bb237c7ff0095f2991f3fb8ffe0c7f0762e41db | |
parent | e0e8a8bf9788b117025dfe2fa42ca9b4e882f14f [diff] | |
parent | 1453310967102ff604e8524da8db3a4f910c4462 [diff] |
Merge "Remove NATT keepalive from IpSecTransform" am: ef8a605c6f am: 1453310967 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1512881 Change-Id: I2ca38b60003595a59deff3b12614f3a8950da91f