commit | 3ae167a73c2b3fe005c07ce98f026974c4c6ee04 | [log] [tgz] |
---|---|---|
author | Chiachang Wang <chiachangwang@google.com> | Tue Jul 04 11:32:05 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jul 04 11:32:05 2023 +0000 |
tree | 13c9f2a94f5f0c2ac0e368a776d90e36f2072ef8 | |
parent | 7f0c787bfeb47402d66e572c8037c312a2067334 [diff] | |
parent | 44a24c16dbca6bbf5cb4ee1bf401891c6038b3b0 [diff] |
Merge changes from topics "recoveryTimeUnit", "vpnRecovery" am: 537451ea67 am: b57e43196f am: 51ef024b45 am: 44a24c16db Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2648501 Change-Id: Ic3d85b3a238a400929a1f5b67e839fa70a9cc03b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>