| commit | 559e7604e6c7ce0125a1371d41f8bda96e9c28b6 | [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 | a999c893050ec56e0adae1e1f14af516bf2cebc4 | |
| parent | 349ba03274ce759232349b38057d4e5cd9f20f38 [diff] | |
| parent | 3a86e4690e795f31904bb99e74fc91a9be209357 [diff] |
Merge changes from topic "tcp_keepalive_fix" am: 3a86e4690e Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1494039 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic9e330a2bd8dbb701db0e5b73c1954670d4988fc