am 099b20f3: am 1881395b: am c6752b06: Merge "vold: wildcard support for device path...

author JP Abgrall <jpa@google.com>

Tue, 27 May 2014 19:28:07 +0000 (19:28 +0000)

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

Tue, 27 May 2014 19:28:07 +0000 (19:28 +0000)
author JP Abgrall <jpa@google.com>
Tue, 27 May 2014 19:28:07 +0000 (19:28 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Tue, 27 May 2014 19:28:07 +0000 (19:28 +0000)
diff --cc DirectVolume.cpp
Simple merge
diff --cc DirectVolume.h
Simple merge
author	JP Abgrall <jpa@google.com>
	Tue, 27 May 2014 19:28:07 +0000 (19:28 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Tue, 27 May 2014 19:28:07 +0000 (19:28 +0000)
		1	2
DirectVolume.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
DirectVolume.h	patch \|	diff1 \|	diff2 \|	blob \| history