OSDN Git Service

Merge "Fix SocketKeepalive APIs which do not meet API review requirement" am: 8324c3e7e5
authorJunyu Lai <junyulai@google.com>
Mon, 25 Mar 2019 11:06:39 +0000 (04:06 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 25 Mar 2019 11:06:39 +0000 (04:06 -0700)
commitd24f3fc8b1ba709ff983f27e026c5f3fa9b52fa4
tree7a466ec6342deb87be36b79d59d0caef629da3f7
parentf6ae002ababe685a4dd91d9b65cd25ee0a7faa97
parent08e1787088d1ea9cd6c818eaeacb84df2b293499
Merge "Fix SocketKeepalive APIs which do not meet API review requirement" am: 8324c3e7e5
am: 08e1787088

Change-Id: Iead39e877aec917ff3c409fda1ff0c4dbaa21fcb
api/current.txt