Merge "Store password in vold"

author Paul Lawrence <paullawrence@google.com>

Fri, 21 Mar 2014 20:40:36 +0000 (20:40 +0000)

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

Fri, 21 Mar 2014 20:40:36 +0000 (20:40 +0000)
author Paul Lawrence <paullawrence@google.com>
Fri, 21 Mar 2014 20:40:36 +0000 (20:40 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Fri, 21 Mar 2014 20:40:36 +0000 (20:40 +0000)
diff --cc cryptfs.c
Simple merge
diff --cc cryptfs.h
Simple merge
author	Paul Lawrence <paullawrence@google.com>
	Fri, 21 Mar 2014 20:40:36 +0000 (20:40 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Fri, 21 Mar 2014 20:40:36 +0000 (20:40 +0000)
		1	2
cryptfs.c	patch \|	diff1 \|	diff2 \|	blob \| history
cryptfs.h	patch \|	diff1 \|	diff2 \|	blob \| history