Merge "Update DPMS to push active admins info to UsageStatsService."

author Sudheer Shanka <sudheersai@google.com>

Thu, 11 Jan 2018 18:45:15 +0000 (18:45 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Thu, 11 Jan 2018 18:45:15 +0000 (18:45 +0000)
author Sudheer Shanka <sudheersai@google.com>
Thu, 11 Jan 2018 18:45:15 +0000 (18:45 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 11 Jan 2018 18:45:15 +0000 (18:45 +0000)
diff --cc services/devicepolicy/java/com/android/server/devicepolicy/BaseIDevicePolicyManager.java
Simple merge
diff --cc services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
Simple merge
author	Sudheer Shanka <sudheersai@google.com>
	Thu, 11 Jan 2018 18:45:15 +0000 (18:45 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 11 Jan 2018 18:45:15 +0000 (18:45 +0000)
		1	2
services/devicepolicy/java/com/android/server/devicepolicy/BaseIDevicePolicyManager.java	patch \|	diff1 \|	diff2 \|	blob \| history
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java	patch \|	diff1 \|	diff2 \|	blob \| history