diff options
| author | 2011-06-02 16:46:05 -0700 | |
|---|---|---|
| committer | 2011-06-02 16:46:05 -0700 | |
| commit | f889eaf379e33fc12eee4d91f70b9e61f04b727e (patch) | |
| tree | 5ab1223fc671a07ce46df8242ac9fdd4129d4f1a | |
| parent | 04fc3f9d2122614902aae21ec44cc9fd272b6308 (diff) | |
| parent | b18d467bbc0f3325d6239a9741df3b2073e4ec82 (diff) | |
Merge "resolved conflicts for merge of 54cb63e2 to master"
| -rw-r--r-- | include/utils/ResourceTypes.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/utils/ResourceTypes.h b/include/utils/ResourceTypes.h index 7d3fc06117..8a92cd6e18 100644 --- a/include/utils/ResourceTypes.h +++ b/include/utils/ResourceTypes.h @@ -841,6 +841,7 @@ struct ResTable_config DENSITY_DEFAULT = ACONFIGURATION_DENSITY_DEFAULT, DENSITY_LOW = ACONFIGURATION_DENSITY_LOW, DENSITY_MEDIUM = ACONFIGURATION_DENSITY_MEDIUM, + DENSITY_TV = ACONFIGURATION_DENSITY_TV, DENSITY_HIGH = ACONFIGURATION_DENSITY_HIGH, DENSITY_NONE = ACONFIGURATION_DENSITY_NONE }; |