resolved conflicts for merge of bbca8133 to master

Change-Id: I81493674dceab848e41d380a77a37e5a9be06db6

diff --git a/AaptAssets.cpp b/AaptAssets.cpp
index 75535f8bfee6969554aa694908db1edbdcc255eb..48941961ccb9bca973e99c9c7232a55de73308d4 100644 (file)
--- a/AaptAssets.cpp
+++ b/AaptAssets.cpp
@@ -913,6 +913,11 @@ bool AaptGroupEntry::getUiModeTypeName(const char* name,
               (out->uiMode&~ResTable_config::MASK_UI_MODE_TYPE)
               | ResTable_config::UI_MODE_TYPE_CAR;
         return true;
+    } else if (strcmp(name, "television") == 0) {
+      if (out) out->uiMode =
+              (out->uiMode&~ResTable_config::MASK_UI_MODE_TYPE)
+              | ResTable_config::UI_MODE_TYPE_TELEVISION;
+        return true;
     }
 
     return false;