Colin Cross ff6fcaec0b Merge "Make services.core the final priorityboosted jar" am: a0c1780d3c ...

am: 93de069ec9

Change-Id: Ib1a626060f2e2d617ca0b51e016cc7e06cae27d8

2017-12-13 20:43:20 +00:00

..

java/com/android/server

Merge "OMS: Only allow trusted overlays to be registered." into oc-mr1-dev

2017-12-12 23:36:57 +00:00

jni

Merge "Revert "Remove empty ScopedArray constructor.""

2017-12-09 13:26:00 +00:00

Android.bp

Make services.core the final priorityboosted jar

2017-12-12 19:43:04 -08:00