commit | c9ca5c299e9454d0549e931ee8d386584499362c | [log] [tgz] |
---|---|---|
author | Chiachang Wang <chiachangwang@google.com> | Mon Jul 10 02:36:53 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jul 10 02:36:53 2023 +0000 |
tree | 62c89bea982d92d87443782f902e4ebca09e9d04 | |
parent | 1b4bff151d3785fba336a5505c5abee710ef4374 [diff] | |
parent | deb311946b7021956022c63ec3a06645a27cfbc3 [diff] |
Merge "Limit the translation code on NAT-T keepalive" into main am: 7f8015fe9e am: 42d3047701 am: deb311946b Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2649939 Change-Id: I31b8612b0ec004f38a382e43aebf2d0235756c4f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>