Mark Chien 4e8eeb93c9 Merge "Don't allow upstream if entitlement don't know any downstream" am: 161814ffb1 am: 538bc0fe4f am: 5d2bb5b544 ...

am: 4fbf46cdc5

Change-Id: If75db66e9e24d802b01267d1e7686d7261138be6

2019-08-13 03:13:44 -07:00

..

java/com/android/server

Merge "Don't allow upstream if entitlement don't know any downstream" am: 161814ffb1 am: 538bc0fe4f am: 5d2bb5b544

2019-08-13 03:13:44 -07:00

jni

…

xsd

Merge "Add a platform compat config schema API."

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

Android.bp

resolve merge conflicts of 56509ddb84 to stage-aosp-master

2019-07-29 15:21:58 +01:00