Merge "Introduce system API to get source of user restriction" into nyc-dev

author Zoltan Szatmary-Ban <szatmz@google.com>

Tue, 17 May 2016 15:16:55 +0000 (15:16 +0000)

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

Tue, 17 May 2016 15:16:56 +0000 (15:16 +0000)
author Zoltan Szatmary-Ban <szatmz@google.com>
Tue, 17 May 2016 15:16:55 +0000 (15:16 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 17 May 2016 15:16:56 +0000 (15:16 +0000)
diff --cc api/system-current.txt
Simple merge
diff --cc core/java/android/os/UserManager.java
Simple merge
diff --cc services/core/java/com/android/server/pm/UserManagerService.java
Simple merge
author	Zoltan Szatmary-Ban <szatmz@google.com>
	Tue, 17 May 2016 15:16:55 +0000 (15:16 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 17 May 2016 15:16:56 +0000 (15:16 +0000)
		1	2
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
core/java/android/os/UserManager.java	patch \|	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/pm/UserManagerService.java	patch \|	diff1 \|	diff2 \|	blob \| history