Aaron Huang 8f98e732a0 Merge "Remove ProxyInfo(String) and update callers to use ProxyInfo(Uri)" am: c36f17d32e am: 5463bbece5 ...

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

Change-Id: If60a348768c507153c1a9038953b2f6c29fc8f03

2020-07-17 06:05:38 +00:00

..

java/android/net

Merge "Remove ProxyInfo(String) and update callers to use ProxyInfo(Uri)" am: c36f17d32e am: 5463bbece5

2020-07-17 06:05:38 +00:00

jni

Merge changes from topic "lnh-platform-split"

2020-06-25 07:36:05 +00:00