Merge "Adds user broadcasts to UserManagerHelper." into pi-dev

author Jovana Knezevic <jovanak@google.com>

Wed, 11 Apr 2018 22:20:33 +0000 (22:20 +0000)

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

Wed, 11 Apr 2018 22:20:33 +0000 (22:20 +0000)
author Jovana Knezevic <jovanak@google.com>
Wed, 11 Apr 2018 22:20:33 +0000 (22:20 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 11 Apr 2018 22:20:33 +0000 (22:20 +0000)
diff --cc packages/SettingsLib/src/com/android/settingslib/users/UserManagerHelper.java
Simple merge
diff --cc packages/SettingsLib/tests/integ/src/com/android/settingslib/users/UserManagerHelperTest.java
Simple merge
author	Jovana Knezevic <jovanak@google.com>
	Wed, 11 Apr 2018 22:20:33 +0000 (22:20 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 11 Apr 2018 22:20:33 +0000 (22:20 +0000)
		1	2
packages/SettingsLib/src/com/android/settingslib/users/UserManagerHelper.java	patch \|	diff1 \|	diff2 \|	blob \| history
packages/SettingsLib/tests/integ/src/com/android/settingslib/users/UserManagerHelperTest.java	patch \|	diff1 \|	diff2 \|	blob \| history