Treehugger Robot 6dc4b5aaa0 Merge "[Mainline] Network netId to getNetId() migration" am: cd20ac9243 am: 249e8cab99 am: e42273a5f7 ...

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6c09a80a7dd55b357426e01b50725254a9c03148

2020-12-10 10:01:36 +00:00

..

java/com/android/server

Merge "[Mainline] Network netId to getNetId() migration" am: cd20ac9243 am: 249e8cab99 am: e42273a5f7

2020-12-10 10:01:36 +00:00

jni

Add support for TAP interfaces in TestNetworkManager.

2019-04-11 12:04:23 +00:00