| commit | 66508a1e66bd772e8ca816615c433ed30a9a55e1 | [log] [tgz] |
|---|---|---|
| author | Remi NGUYEN VAN <reminv@google.com> | Tue Dec 15 10:23:23 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Dec 15 10:23:23 2020 +0000 |
| tree | c5a41574b33955bcf13bfe05993c29ab2af634d6 | |
| parent | 40190840bbf2d3637d6b34b235ca2a0133dbd033 [diff] | |
| parent | a0038ffa9dda90664fec2ec685a31fadd19ee31d [diff] |
Merge changes from topic "tcp_keepalive_fix" am: eada640d5d am: a0038ffa9d Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1494039 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Idedfa2e8237109824683a9923079b02835c39acc