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