| commit | 901bb3a426b8f7879e6d81c34dfd1069323a402c | [log] [tgz] |
|---|---|---|
| author | Junyu Lai <junyulai@google.com> | Tue Jan 16 08:08:06 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jan 16 08:08:06 2024 +0000 |
| tree | 41495a32f99644173c20bd89e2821760e32b10f8 | |
| parent | 402bf2dd304ebfb11e7fe761b2d8901a5ae2d28c [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: Iecb470087f11f2e07ebb331977072cd6fbd90a85 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>