am 52f5425f: Merge "Fix Vold to properly handle full-disk file systems"

author JP Abgrall <jpa@google.com>

Fri, 15 Aug 2014 20:56:13 +0000 (20:56 +0000)

committer Android Git Automerger <android-git-automerger@android.com>

Fri, 15 Aug 2014 20:56:13 +0000 (20:56 +0000)
author JP Abgrall <jpa@google.com>
Fri, 15 Aug 2014 20:56:13 +0000 (20:56 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Fri, 15 Aug 2014 20:56:13 +0000 (20:56 +0000)
diff --cc DirectVolume.cpp
Simple merge
diff --cc DirectVolume.h
Simple merge
author	JP Abgrall <jpa@google.com>
	Fri, 15 Aug 2014 20:56:13 +0000 (20:56 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Fri, 15 Aug 2014 20:56:13 +0000 (20:56 +0000)
		1	2
DirectVolume.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
DirectVolume.h	patch \|	diff1 \|	diff2 \|	blob \| history