Merge "Allow DO to remove user even if DISALLOW_REMOVE_USER is set."

author Nicolas Prévot <nprevot@google.com>

Mon, 31 Oct 2016 11:23:23 +0000 (11:23 +0000)

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

Mon, 31 Oct 2016 11:23:27 +0000 (11:23 +0000)
author Nicolas Prévot <nprevot@google.com>
Mon, 31 Oct 2016 11:23:23 +0000 (11:23 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Mon, 31 Oct 2016 11:23:27 +0000 (11:23 +0000)
diff --cc services/core/java/com/android/server/pm/UserManagerService.java
Simple merge
author	Nicolas Prévot <nprevot@google.com>
	Mon, 31 Oct 2016 11:23:23 +0000 (11:23 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Mon, 31 Oct 2016 11:23:27 +0000 (11:23 +0000)