Junyu Lai d85c0d27b9 Merge "Notify the keepalive is stopped after the slot has been released" am: c4aaac8af6 am: b5e1feccbe ...

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1112851

Change-Id: Icdd61fb39ebd14963f4ec6e591b3a245e6b999b2

2020-08-28 11:09:43 +00:00

..

java/android/net

Merge "Notify the keepalive is stopped after the slot has been released" am: c4aaac8af6 am: b5e1feccbe

2020-08-28 11:09:43 +00:00

jni

Update language to comply with Android's inclusive language guidance

2020-08-03 17:04:58 +00:00