OSDN Git Service

Merge changes I92f6d977,I06840834 into qt-dev
authorJunyu Lai <junyulai@google.com>
Mon, 13 May 2019 09:44:49 +0000 (09:44 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 13 May 2019 09:44:49 +0000 (09:44 +0000)
commitb05b4d609fe749928e34f3303a01ceaa6a75b6f1
treeef0d5a638b40cae3d8339b3e3fc78b700b9544ea
parent1439a16e1537e9119755212865113215a3244095
parent3c5fe888675b4f60b76cd058a3296112c8037b63
Merge changes I92f6d977,I06840834 into qt-dev

* changes:
  Limit unprivileged keepalives per uid
  Support customization of supported keepalive count per transport