Merge "Use SetupWizardLib helpers"

author Maurice Lam <yukl@google.com>

Sat, 18 Apr 2015 00:48:21 +0000 (00:48 +0000)

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

Sat, 18 Apr 2015 00:48:22 +0000 (00:48 +0000)
author Maurice Lam <yukl@google.com>
Sat, 18 Apr 2015 00:48:21 +0000 (00:48 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Sat, 18 Apr 2015 00:48:22 +0000 (00:48 +0000)
diff --cc src/com/android/settings/SetupChooseLockGeneric.java
Simple merge
diff --cc src/com/android/settings/SetupChooseLockPassword.java
Simple merge
diff --cc src/com/android/settings/SetupChooseLockPattern.java
Simple merge
author	Maurice Lam <yukl@google.com>
	Sat, 18 Apr 2015 00:48:21 +0000 (00:48 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Sat, 18 Apr 2015 00:48:22 +0000 (00:48 +0000)
		1	2
src/com/android/settings/SetupChooseLockGeneric.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/com/android/settings/SetupChooseLockPassword.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/com/android/settings/SetupChooseLockPattern.java	patch \|	diff1 \|	diff2 \|	blob \| history