From: Dianne Hackborn <hackbod@google.com>
Date: Thu, 2 Jun 2011 23:44:52 +0000 (-0700)
Subject: resolved conflicts for merge of 54cb63e2 to master
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/83c734a53b345465ecafa37c5c6d4cc180161d6f?hp=715618afe423f0b4234e82df4c8a6f572f6b086e

resolved conflicts for merge of 54cb63e2 to master

Change-Id: I5b741a1781e3f76c03fc1534ffce871117effd10
---

diff --git a/AaptAssets.cpp b/AaptAssets.cpp
index 4894196..29d2b87 100644
--- 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;