am 528c49f1: am b96cbbd1: Add "tv" density for 720p screens.

author Dianne Hackborn <hackbod@google.com>

Fri, 27 May 2011 21:27:46 +0000 (14:27 -0700)

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

Fri, 27 May 2011 21:27:46 +0000 (14:27 -0700)
author Dianne Hackborn <hackbod@google.com>
Fri, 27 May 2011 21:27:46 +0000 (14:27 -0700)
committer Android Git Automerger <android-git-automerger@android.com>
Fri, 27 May 2011 21:27:46 +0000 (14:27 -0700)
diff --cc api/current.xml
Simple merge
diff --cc include/utils/ResourceTypes.h
Simple merge
author	Dianne Hackborn <hackbod@google.com>
	Fri, 27 May 2011 21:27:46 +0000 (14:27 -0700)
committer	Android Git Automerger <android-git-automerger@android.com>
	Fri, 27 May 2011 21:27:46 +0000 (14:27 -0700)
		1	2
api/current.xml	patch \|	diff1 \|	diff2 \|	blob \| history
include/utils/ResourceTypes.h	patch \|	diff1 \|	diff2 \|	blob \| history