am 46a282f3: am 0ed2e845: Merge "DO NOT MERGE. Integrate add new screen width/height...

author Dianne Hackborn <hackbod@google.com>

Fri, 13 May 2011 18:21:26 +0000 (11:21 -0700)

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

Fri, 13 May 2011 18:21:26 +0000 (11:21 -0700)
author Dianne Hackborn <hackbod@google.com>
Fri, 13 May 2011 18:21:26 +0000 (11:21 -0700)
committer Android Git Automerger <android-git-automerger@android.com>
Fri, 13 May 2011 18:21:26 +0000 (11:21 -0700)
diff --cc include/utils/ResourceTypes.h
Simple merge
diff --cc libs/utils/ResourceTypes.cpp
Simple merge
author	Dianne Hackborn <hackbod@google.com>
	Fri, 13 May 2011 18:21:26 +0000 (11:21 -0700)
committer	Android Git Automerger <android-git-automerger@android.com>
	Fri, 13 May 2011 18:21:26 +0000 (11:21 -0700)
		1	2
include/utils/ResourceTypes.h	patch \|	diff1 \|	diff2 \|	blob \| history
libs/utils/ResourceTypes.cpp	patch \|	diff1 \|	diff2 \|	blob \| history