Merge "Added an introduction to the fingerprint enrollment" into mnc-dev

author Selim Cinek <cinek@google.com>

Fri, 12 Jun 2015 21:57:44 +0000 (21:57 +0000)

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

Fri, 12 Jun 2015 21:57:45 +0000 (21:57 +0000)
author Selim Cinek <cinek@google.com>
Fri, 12 Jun 2015 21:57:44 +0000 (21:57 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Fri, 12 Jun 2015 21:57:45 +0000 (21:57 +0000)
diff --cc AndroidManifest.xml
Simple merge
diff --cc res/values/styles.xml
Simple merge
author	Selim Cinek <cinek@google.com>
	Fri, 12 Jun 2015 21:57:44 +0000 (21:57 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Fri, 12 Jun 2015 21:57:45 +0000 (21:57 +0000)
		1	2
AndroidManifest.xml	patch \|	diff1 \|	diff2 \|	blob \| history
res/values/styles.xml	patch \|	diff1 \|	diff2 \|	blob \| history