| commit | a0038ffa9dda90664fec2ec685a31fadd19ee31d | [log] [tgz] |
|---|---|---|
| author | Remi NGUYEN VAN <reminv@google.com> | Tue Dec 15 09:41:42 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Dec 15 09:41:42 2020 +0000 |
| tree | 1c4f0ad036227ffbfe9fc1b3a4bb052a6be9c168 | |
| parent | a232c68028b77a31788b4b3484a6f1e2882891f0 [diff] | |
| parent | eada640d5d9cd7941495c860654b1b66f7e4efa8 [diff] |
Merge changes from topic "tcp_keepalive_fix" am: eada640d5d Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1494039 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic9e330a2bd8dbb701db0e5b73c1954670d4988fc