| commit | 249b9ed28abf812427c68b7aa55e5c93a46b796d | [log] [tgz] |
|---|---|---|
| author | Junyu Lai <junyulai@google.com> | Tue Jan 16 09:12:30 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jan 16 09:12:30 2024 +0000 |
| tree | 9257b66e9a2897f019ee497213f00135a1376e2d | |
| parent | d041d1804d91c137d50fa799073303bee7dd0c0e [diff] | |
| parent | 1af7fc03df938295ad0183316cf6e652432af1e4 [diff] |
Merge changes from topics "remove-napt", "support-multipleaddr" into main am: 24b54c2285 am: 901bb3a426 am: 1af7fc03df Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2902332 Change-Id: I543932151202350852369193a18d15d69ed948ea Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>