Yan Yan 5e45322620 Merge changes from topic "new-ipsec-api" am: a80fb3bbe6 am: cb5aed6518 am: 4cddef19b1 am: df0053fc49 ...

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

Change-Id: I18748127d0c97d9473c96678d556b03ad6048808

2020-10-17 00:09:20 +00:00

..

android

Merge changes from topic "new-ipsec-api"

2020-10-16 22:30:37 +00:00

com/android

Merge "Stop setting the legacy net.dnsX system properties" am: 61da71aa03 am: 5b53e5f4d6 am: 1eb54fa910 am: d1c4e9aebe

2020-10-16 15:23:18 +00:00