Merge \"Reduce shell power over user management.\" into nyc-dev

author Sudheer Shanka <sudheersai@google.com>

Fri, 10 Jun 2016 21:39:22 +0000 (21:39 +0000)

committer android-build-merger <android-build-merger@google.com>

Fri, 10 Jun 2016 21:39:22 +0000 (21:39 +0000)
author Sudheer Shanka <sudheersai@google.com>
Fri, 10 Jun 2016 21:39:22 +0000 (21:39 +0000)
committer android-build-merger <android-build-merger@google.com>
Fri, 10 Jun 2016 21:39:22 +0000 (21:39 +0000)
diff --cc core/res/AndroidManifest.xml
Simple merge
diff --cc services/core/java/com/android/server/pm/UserManagerService.java
Simple merge
author	Sudheer Shanka <sudheersai@google.com>
	Fri, 10 Jun 2016 21:39:22 +0000 (21:39 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Fri, 10 Jun 2016 21:39:22 +0000 (21:39 +0000)
		1	2
core/res/AndroidManifest.xml	patch \|	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/pm/UserManagerService.java	patch \|	diff1 \|	diff2 \|	blob \| history