Merge "Adds screen lock as a suggested activity"

author Udam Saini <udam@google.com>

Wed, 27 Jan 2016 18:08:48 +0000 (18:08 +0000)

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

Wed, 27 Jan 2016 18:08:48 +0000 (18:08 +0000)
author Udam Saini <udam@google.com>
Wed, 27 Jan 2016 18:08:48 +0000 (18:08 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 27 Jan 2016 18:08:48 +0000 (18:08 +0000)
diff --cc AndroidManifest.xml
Simple merge
diff --cc res/values/strings.xml
Simple merge
diff --cc src/com/android/settings/ChooseLockGeneric.java
Simple merge
diff --cc src/com/android/settings/dashboard/DashboardSummary.java
Simple merge
author	Udam Saini <udam@google.com>
	Wed, 27 Jan 2016 18:08:48 +0000 (18:08 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 27 Jan 2016 18:08:48 +0000 (18:08 +0000)
		1	2
AndroidManifest.xml	patch \|	diff1 \|	diff2 \|	blob \| history
res/values/strings.xml	patch \|	diff1 \|	diff2 \|	blob \| history
src/com/android/settings/ChooseLockGeneric.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/com/android/settings/dashboard/DashboardSummary.java	patch \|	diff1 \|	diff2 \|	blob \| history