| commit | 977234aba234501c7fdb313f69812885eed6f025 | [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 | 3d5dc72ac1db21827b7f32e3ad431f9704a24b93 | |
| parent | d75731b1243504459e249d2af28626f3cfdef938 [diff] | |
| parent | c2d9d5e588f04475e0a2d8d118231b73669969f3 [diff] |
Merge changes from topic "tcp_keepalive_fix" am: a8f21187be am: c2d9d5e588 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1494039 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Idedfa2e8237109824683a9923079b02835c39acc