resolved conflicts for merge of 54cb63e2 to master

Change-Id: I5b741a1781e3f76c03fc1534ffce871117effd10

diff --git a/AaptAssets.cpp b/AaptAssets.cpp
index 48941961ccb9bca973e99c9c7232a55de73308d4..29d2b872eadd61f55a903d8fb830a56907bd95bc 100644 (file)
--- a/AaptAssets.cpp
+++ b/AaptAssets.cpp
@@ -969,6 +969,11 @@ bool AaptGroupEntry::getDensityName(const char* name,
         return true;
     }
     
+    if (strcmp(name, "tvdpi") == 0) {
+        if (out) out->density = ResTable_config::DENSITY_TV;
+        return true;
+    }
+    
     if (strcmp(name, "hdpi") == 0) {
         if (out) out->density = ResTable_config::DENSITY_HIGH;
         return true;