commit e2c7715c772d5121397591b532d04a31b3ffcc99
author Dianne Hackborn <hackbod@google.com> Tue May 24 11:27:11 2011 -0700
committer Dianne Hackborn <hackbod@google.com> Tue May 24 11:27:11 2011 -0700
tree a528b89349ba2b367aeae8b442b5c696a7c8c99e
parent 6895c4994350bc10a06481ecf42c4ba8abb3eedb
parent bbca81334e3603c7328dc526bd63032b23d5261d

resolved conflicts for merge of bbca8133 to master

Change-Id: I81493674dceab848e41d380a77a37e5a9be06db6

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index 3339497..746916d 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -6003,6 +6003,7 @@
     field public static final int UI_MODE_TYPE_DESK = 2; // 0x2
     field public static final int UI_MODE_TYPE_MASK = 15; // 0xf
     field public static final int UI_MODE_TYPE_NORMAL = 1; // 0x1
+    field public static final int UI_MODE_TYPE_TELEVISION = 4; // 0x4
     field public static final int UI_MODE_TYPE_UNDEFINED = 0; // 0x0
     field public float fontScale;
     field public int hardKeyboardHidden;