Dianne Hackborn 2b8336f241 Merge "Allow device/profile owners to change app ops modes." into pi-dev am: adaca2146d ...

am: 82a87674ce

Change-Id: Id4a52aaca3d94075ff179141e96fba5c7326d4ee

2018-05-14 14:32:23 -07:00

..

java/com/android/server/devicepolicy

Merge "Allow device/profile owners to change app ops modes." into pi-dev am: adaca2146d

2018-05-14 14:32:23 -07:00

Android.bp

Convert services to Android.bp

2017-12-08 21:00:15 +00:00