commit | a1945f0a5451d08ebaf25a16649ad300d9e862e7 | [log] [tgz] |
---|---|---|
author | Junyu Lai <junyulai@google.com> | Tue Jan 16 08:06:23 2024 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jan 16 08:06:23 2024 +0000 |
tree | 4899c6bcf0efee7b90503bdc7b5a848a4a5ceb63 | |
parent | fc9b11fb910a8c2d903589095be44f974588c300 [diff] | |
parent | 24b54c2285227e8c8903d4bfdc820837ab59600a [diff] |
Merge changes from topics "remove-napt", "support-multipleaddr" into main am: 24b54c2285 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2902332 Change-Id: Iab4cec649fbad74f5598d44a9cc8ecfa7ffa9137 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>