Neil Fuller 6653f2b201 Merge "resolve merge conflicts of bd592e0439 to stage-aosp-master" into stage-aosp-master am: 6948bc8ce1 am: 2b52914445 ...

am: 7a5ba3f59d

Change-Id: Idcee9696bdb3cd2e65809f44eff0f8ff77782d27

2019-08-23 21:48:12 -07:00

..

java/com/android/server

Merge "resolve merge conflicts of bd592e0439 to stage-aosp-master" into stage-aosp-master am: 6948bc8ce1 am: 2b52914445

2019-08-23 21:48:12 -07:00

jni

…

xsd

Merge "Add a platform compat config schema API."

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

Android.bp

Move IPlatformCompat.aidl definition to framework.jar

2019-08-14 16:47:18 +01:00