Merge "Return USER_OP_SUCCESS when force stopping a user"

author Fyodor Kupolov <fkupolov@google.com>

Mon, 4 Jan 2016 20:59:12 +0000 (20:59 +0000)

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

Mon, 4 Jan 2016 20:59:12 +0000 (20:59 +0000)
author Fyodor Kupolov <fkupolov@google.com>
Mon, 4 Jan 2016 20:59:12 +0000 (20:59 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Mon, 4 Jan 2016 20:59:12 +0000 (20:59 +0000)
diff --cc services/core/java/com/android/server/am/UserController.java
Simple merge
author	Fyodor Kupolov <fkupolov@google.com>
	Mon, 4 Jan 2016 20:59:12 +0000 (20:59 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Mon, 4 Jan 2016 20:59:12 +0000 (20:59 +0000)