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