Merge "Track rename from base/ to android-base/."

author Elliott Hughes <enh@google.com>

Sat, 5 Dec 2015 01:39:41 +0000 (17:39 -0800)

committer android-build-merger <android-build-merger@google.com>

Sat, 5 Dec 2015 01:39:41 +0000 (17:39 -0800)
author Elliott Hughes <enh@google.com>
Sat, 5 Dec 2015 01:39:41 +0000 (17:39 -0800)
committer android-build-merger <android-build-merger@google.com>
Sat, 5 Dec 2015 01:39:41 +0000 (17:39 -0800)
diff --cc CryptCommandListener.cpp
Simple merge
diff --cc Disk.cpp
Simple merge
diff --cc EmulatedVolume.cpp
Simple merge
diff --cc Utils.cpp
Simple merge
author	Elliott Hughes <enh@google.com>
	Sat, 5 Dec 2015 01:39:41 +0000 (17:39 -0800)
committer	android-build-merger <android-build-merger@google.com>
	Sat, 5 Dec 2015 01:39:41 +0000 (17:39 -0800)
		1	2
CryptCommandListener.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
Disk.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
EmulatedVolume.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
Utils.cpp	patch \|	diff1 \|	diff2 \|	blob \| history