Merge "Add new protection level for setup wizard" into nyc-dev

author Russell Brenner <russellbrenner@google.com>

Fri, 1 Apr 2016 16:22:48 +0000 (16:22 +0000)

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

Fri, 1 Apr 2016 16:22:49 +0000 (16:22 +0000)
author Russell Brenner <russellbrenner@google.com>
Fri, 1 Apr 2016 16:22:48 +0000 (16:22 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Fri, 1 Apr 2016 16:22:49 +0000 (16:22 +0000)
diff --cc api/current.txt
Simple merge
diff --cc api/system-current.txt
Simple merge
diff --cc api/test-current.txt
Simple merge
diff --cc services/core/java/com/android/server/pm/PackageManagerService.java
Simple merge
author	Russell Brenner <russellbrenner@google.com>
	Fri, 1 Apr 2016 16:22:48 +0000 (16:22 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Fri, 1 Apr 2016 16:22:49 +0000 (16:22 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/test-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/pm/PackageManagerService.java	patch \|	diff1 \|	diff2 \|	blob \| history