OSDN Git Service

Merge "Change the netId to nethandle mapping." am: 9456c020d8 am: feaf412e19
authorLorenzo Colitti <lorenzo@google.com>
Tue, 16 Jan 2018 05:32:55 +0000 (05:32 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 16 Jan 2018 05:32:55 +0000 (05:32 +0000)
commit7e933876fa6b2c2ed95f43efa421f7adb7b20aff
tree76930b11eaf8908af5b5a8ca57b017c97e069273
parent278050ed4e63a2d68547336f8ecd5501ed29eddb
parent93e0bad4223a0d40ef81650fd3385c0dc10aab8d
Merge "Change the netId to nethandle mapping." am: 9456c020d8 am: feaf412e19
am: 93e0bad422

Change-Id: I06e09bfaeb1040b97afa392faace339eb5bab4ad
core/java/android/net/Network.java