OSDN Git Service

Merge "Freeze the networkstack-aidl-interfaces interface" am: 950767f9f9
authorLorenzo Colitti <lorenzo@google.com>
Tue, 23 Apr 2019 08:55:01 +0000 (01:55 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 23 Apr 2019 08:55:01 +0000 (01:55 -0700)
commit9b89cdaaf401a6b77e160807039c06e537fa600a
tree2a4bf5c456a9eb4c94752be4b661d50f38624fef
parentdf9591a4dc58da5744dd7876acf112ef3f32e6eb
parent6c88bf9bd746664cbe2fff22daee340141a04180
Merge "Freeze the networkstack-aidl-interfaces interface" am: 950767f9f9
am: 6c88bf9bd7

Change-Id: I0bc827a6c7995eb7b50b4afeed11317ad8e29666
services/core/java/com/android/server/ConnectivityService.java