Merge "Finish issue #37815224: DeviceManagementService is incorrectly..." into oc-dev

am: 8d0ba598cf

Change-Id: Ie1dd7e7f3ceef9a39439a0bb62770ec90128525a
This commit is contained in:
Dianne Hackborn
2017-05-12 00:32:42 +00:00
committed by android-build-merger

View File

@@ -181,9 +181,6 @@
<allow-in-power-save package="com.android.cellbroadcastreceiver" />
<allow-in-power-save package="com.android.shell" />
<!-- STOPSHIP(b/36856786): Revert this once it is fixed properly -->
<allow-in-power-save package="com.google.android.apps.enterprise.dmagent" />
<!-- These are the packages that are white-listed to be able to run as system user -->
<system-user-whitelisted-app package="com.android.settings" />