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