junyulai 8da3e895cf Merge "Fix LockdownVpnTracker deadlock when resetting legacy Always-On VPN" am: c07aed0fd4 am: d471b98baa am: 27ce36843a ...

am: 0e3ed6ed6f

Change-Id: I6b9f7942a456fdf790be2961e5b154be49df3121

2019-08-30 08:58:39 -07:00

..

java/com/android/server

Merge "Fix LockdownVpnTracker deadlock when resetting legacy Always-On VPN" am: c07aed0fd4 am: d471b98baa am: 27ce36843a

2019-08-30 08:58:39 -07:00

jni

…

xsd

Merge "Add a platform compat config schema API."

2019-07-25 08:57:16 -07:00

Android.bp

Merge "Support enable/disable dns forwarding of dnsmasq when start tethering"

2019-08-28 06:06:44 -07:00