am a43aaf00: resolved conflicts for merge of 9c00e673 to jb-mr1.1-dev

* commit 'a43aaf00b583e8a88681cdcc6ebe1ae2c52f6f20': Fix CalendarView to show the right labels. [DO NOT MERGE]
2014-05-13 17:14:07 +00:00
parent 07f8da65e2 a43aaf00b5
commit 425addb944
1 changed files with 1 additions and 0 deletions
--- a/tools/layoutlib/create/src/com/android/tools/layoutlib/create/CreateInfo.java
+++ b/tools/layoutlib/create/src/com/android/tools/layoutlib/create/CreateInfo.java
@@ -136,6 +136,7 @@ public final class CreateInfo implements ICreateInfo {
        "android.text.format.DateFormat#is24HourFormat",
        "android.view.Choreographer#getRefreshRate",
        "android.view.Display#updateDisplayInfoLocked",
+        "android.view.Display#getWindowManager",
        "android.view.LayoutInflater#rInflate",
        "android.view.LayoutInflater#parseInclude",
        "android.view.View#isInEditMode",