OSDN Git Service

Merge "Fix SocketKeepalive APIs which do not meet API review requirement"
authorJunyu Lai <junyulai@google.com>
Mon, 25 Mar 2019 10:42:37 +0000 (10:42 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Mon, 25 Mar 2019 10:42:37 +0000 (10:42 +0000)
commit8324c3e7e55c77fae5ca7785d99bd094a7ef49f4
treec06d556c7b670b247a67c4084840595240a836fc
parent743a4b7872a66c9e17e8dc7e8771e5e26f99e433
parent0c66697770fcebc24ca6d783afee677d1a20deed
Merge "Fix SocketKeepalive APIs which do not meet API review requirement"
api/system-current.txt
core/java/android/net/ConnectivityManager.java
services/core/java/com/android/server/ConnectivityService.java