| commit | 5df62bee8203e81d5255cfa0ccc4b018a1e01184 | [log] [tgz] |
|---|---|---|
| author | Yan Yan <evitayan@google.com> | Fri Nov 22 02:42:04 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Nov 22 02:42:04 2024 +0000 |
| tree | 44218809e142735c62fc46405aee4df0666a8e24 | |
| parent | 2494767665719029080428f0142c617b0b6fc770 [diff] | |
| parent | 378d7a9cd18ea4bb62f378229dc30cbd8a44b18a [diff] |
Merge "Only allow clearing NAT timeout when the 25Q2 flag is enabled" into main am: 78d3cf2c47 am: 378d7a9cd1 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3368438 Change-Id: I4545cd73422101607e42fee28c5f98117213fbf4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>