Junyu Lai fe5b645d52 Merge changes from topic "removeNI" am: 5e1ec81e2f am: ecb34129dc am: 925f60252b ...

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3553ff41d85f44c481ea065e6cbda5d286f9e1fa

2021-02-09 05:49:15 +00:00

..

core

Merge changes from topic "removeNI" am: 5e1ec81e2f am: ecb34129dc am: 925f60252b

2021-02-09 05:49:15 +00:00

tests/servicestests/src/com/android/server

[Mainline] Migrate ProxyInfo

2020-12-23 22:15:51 -08:00