Merge "Revert "Add Emergency Info preference to user settings""

author Daniel Sandler <dsandler@android.com>

Thu, 28 Jan 2016 14:24:14 +0000 (14:24 +0000)

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

Thu, 28 Jan 2016 14:24:14 +0000 (14:24 +0000)
author Daniel Sandler <dsandler@android.com>
Thu, 28 Jan 2016 14:24:14 +0000 (14:24 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 28 Jan 2016 14:24:14 +0000 (14:24 +0000)
diff --cc res/values/strings.xml
Simple merge
diff --cc src/com/android/settings/users/UserSettings.java
Simple merge
author	Daniel Sandler <dsandler@android.com>
	Thu, 28 Jan 2016 14:24:14 +0000 (14:24 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 28 Jan 2016 14:24:14 +0000 (14:24 +0000)
		1	2
res/values/strings.xml	patch \|	diff1 \|	diff2 \|	blob \| history
src/com/android/settings/users/UserSettings.java	patch \|	diff1 \|	diff2 \|	blob \| history