Merge "Fix PATTERN UI to align PIN&PASSWORD screen" into pi-dev

author Jyun LuoLai <jyunluolai@google.com>

Fri, 23 Mar 2018 00:56:00 +0000 (00:56 +0000)

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

Fri, 23 Mar 2018 00:56:00 +0000 (00:56 +0000)
author Jyun LuoLai <jyunluolai@google.com>
Fri, 23 Mar 2018 00:56:00 +0000 (00:56 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Fri, 23 Mar 2018 00:56:00 +0000 (00:56 +0000)
diff --cc res/values/colors.xml
Simple merge
diff --cc res/values/strings.xml
Simple merge
author	Jyun LuoLai <jyunluolai@google.com>
	Fri, 23 Mar 2018 00:56:00 +0000 (00:56 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Fri, 23 Mar 2018 00:56:00 +0000 (00:56 +0000)
		1	2
res/values/colors.xml	patch \|	diff1 \|	diff2 \|	blob \| history
res/values/strings.xml	patch \|	diff1 \|	diff2 \|	blob \| history