am 19d49454: am 2bd389e3: Merge "AArch64: Fix printf format strings."

author Colin Cross <ccross@android.com>

Fri, 24 Jan 2014 18:45:47 +0000 (18:45 +0000)

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

Fri, 24 Jan 2014 18:45:47 +0000 (18:45 +0000)
author Colin Cross <ccross@android.com>
Fri, 24 Jan 2014 18:45:47 +0000 (18:45 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Fri, 24 Jan 2014 18:45:47 +0000 (18:45 +0000)
diff --cc BandwidthController.cpp
Simple merge
diff --cc CommandListener.cpp
Simple merge
author	Colin Cross <ccross@android.com>
	Fri, 24 Jan 2014 18:45:47 +0000 (18:45 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Fri, 24 Jan 2014 18:45:47 +0000 (18:45 +0000)
		1	2
BandwidthController.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
CommandListener.cpp	patch \|	diff1 \|	diff2 \|	blob \| history