am a1f5e82f: am a30063d8: am 25eb0464: Merge "Normalize output from aapt d"

author Dianne Hackborn <hackbod@android.com>

Sun, 30 Jan 2011 07:07:48 +0000 (23:07 -0800)

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

Sun, 30 Jan 2011 07:07:48 +0000 (23:07 -0800)
author Dianne Hackborn <hackbod@android.com>
Sun, 30 Jan 2011 07:07:48 +0000 (23:07 -0800)
committer Android Git Automerger <android-git-automerger@android.com>
Sun, 30 Jan 2011 07:07:48 +0000 (23:07 -0800)
diff --cc include/utils/ResourceTypes.h
Simple merge
diff --cc libs/utils/ResourceTypes.cpp
Simple merge
author	Dianne Hackborn <hackbod@android.com>
	Sun, 30 Jan 2011 07:07:48 +0000 (23:07 -0800)
committer	Android Git Automerger <android-git-automerger@android.com>
	Sun, 30 Jan 2011 07:07:48 +0000 (23:07 -0800)
		1	2
include/utils/ResourceTypes.h	patch \|	diff1 \|	diff2 \|	blob \| history
libs/utils/ResourceTypes.cpp	patch \|	diff1 \|	diff2 \|	blob \| history