Steven Moreland fac32905f9 Merge changes from topic "wait-for-aidl" into stage-aosp-master am: d6b5bdf07d am: 4955049ace ...

am: 11912440c5

Change-Id: I9997004285d1299742c50b222edf9301be09fc98

2019-08-30 11:48:29 -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

PowerManagerService: use waitForService.

2019-08-29 13:53:48 -07:00

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