diff options
| author | Dianne Hackborn <hackbod@google.com> | 2011-06-02 16:44:52 -0700 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2011-06-02 16:44:52 -0700 |
| commit | 8a7d44e8248cf7078da6094068b039dacc0a3971 (patch) | |
| tree | dbb6847bc8af2033321069e3ff1a2e0506f0ba14 /include | |
| parent | 0e5e16a656b0002f377f1bcda2e43a97206e4046 (diff) | |
| parent | 54cb63e26e41b80c013b8665878b9c7c7fb328c1 (diff) | |
| download | frameworks_base-8a7d44e8248cf7078da6094068b039dacc0a3971.zip frameworks_base-8a7d44e8248cf7078da6094068b039dacc0a3971.tar.gz frameworks_base-8a7d44e8248cf7078da6094068b039dacc0a3971.tar.bz2 | |
resolved conflicts for merge of 54cb63e2 to master
Change-Id: I5b741a1781e3f76c03fc1534ffce871117effd10
Diffstat (limited to 'include')
| -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 7d3fc06..8a92cd6 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 }; |