Merge \\\"More thorough cleansing of expired users\\\" into nyc-dev am: 4f2b1b455e...

author Amith Yamasani <yamasani@google.com>

Thu, 16 Jun 2016 00:38:28 +0000 (00:38 +0000)

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

Thu, 16 Jun 2016 00:38:28 +0000 (00:38 +0000)
author Amith Yamasani <yamasani@google.com>
Thu, 16 Jun 2016 00:38:28 +0000 (00:38 +0000)
committer android-build-merger <android-build-merger@google.com>
Thu, 16 Jun 2016 00:38:28 +0000 (00:38 +0000)
diff --cc core/java/android/os/UserManager.java
Simple merge
diff --cc services/java/com/android/server/SystemServer.java
Simple merge
author	Amith Yamasani <yamasani@google.com>
	Thu, 16 Jun 2016 00:38:28 +0000 (00:38 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Thu, 16 Jun 2016 00:38:28 +0000 (00:38 +0000)
		1	2
core/java/android/os/UserManager.java	patch \|	diff1 \|	diff2 \|	blob \| history
services/java/com/android/server/SystemServer.java	patch \|	diff1 \|	diff2 \|	blob \| history