Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b18d467b authored by Dianne Hackborn's avatar Dianne Hackborn
Browse files

resolved conflicts for merge of 54cb63e2 to master 

Change-Id: I5b741a1781e3f76c03fc1534ffce871117effd10
parents dccd0899 caf5f713

include/utils/ResourceTypes.h

+1 −0
Original line number Diff line number Diff line
@@ -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

    };