Merge "Tweak SystemUpdatePolicy according to API review." into mnc-dev

author Rubin Xu <rubinxu@google.com>

Tue, 12 May 2015 09:06:09 +0000 (09:06 +0000)

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

Tue, 12 May 2015 09:06:14 +0000 (09:06 +0000)
author Rubin Xu <rubinxu@google.com>
Tue, 12 May 2015 09:06:09 +0000 (09:06 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 12 May 2015 09:06:14 +0000 (09:06 +0000)
diff --cc api/current.txt
Simple merge
diff --cc api/system-current.txt
Simple merge
diff --cc services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
Simple merge
author	Rubin Xu <rubinxu@google.com>
	Tue, 12 May 2015 09:06:09 +0000 (09:06 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 12 May 2015 09:06:14 +0000 (09:06 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java	patch \|	diff1 \|	diff2 \|	blob \| history