| commit | c2d9d5e588f04475e0a2d8d118231b73669969f3 | [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 | d461d85c01929bc4811b6fdd49998b1db1ddc929 | |
| parent | 94183c9cb8f6e325355060910bbb3bf079134f28 [diff] | |
| parent | a8f21187bed4f042cce41bf43646c42c17ed265e [diff] |
Merge changes from topic "tcp_keepalive_fix" am: a8f21187be Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1494039 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic9e330a2bd8dbb701db0e5b73c1954670d4988fc