ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

resolved conflicts for merge of 54cb63e2 to master

Browse Source 
Change-Id: I5b741a1781e3f76c03fc1534ffce871117effd10
This commit is contained in:
Dianne Hackborn 2011-06-02 16:44:52 -07:00
commit b18d467bbc
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/utils/ResourceTypes.h
View File

@ -841,6 +841,7 @@ struct ResTable_config
DENSITY_DEFAULT = ACONFIGURATION_DENSITY_DEFAULT, DENSITY_DEFAULT = ACONFIGURATION_DENSITY_DEFAULT,
DENSITY_LOW = ACONFIGURATION_DENSITY_LOW, DENSITY_LOW = ACONFIGURATION_DENSITY_LOW,
DENSITY_MEDIUM = ACONFIGURATION_DENSITY_MEDIUM, DENSITY_MEDIUM = ACONFIGURATION_DENSITY_MEDIUM,
DENSITY_TV = ACONFIGURATION_DENSITY_TV,
DENSITY_HIGH = ACONFIGURATION_DENSITY_HIGH, DENSITY_HIGH = ACONFIGURATION_DENSITY_HIGH,
DENSITY_NONE = ACONFIGURATION_DENSITY_NONE DENSITY_NONE = ACONFIGURATION_DENSITY_NONE
}; };