commit 5fc8f945ee6a763b08e47019319432ec71ba1d1a
author Deepanshu Gupta <deepanshu@google.com> Tue May 13 17:45:43 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue May 13 17:45:43 2014 +0000
tree 1629b381d37037c68755d90861a8b41d13113a58
parent 3271adea10a7a35d4fe852801794038f01e371be
parent b0f2ded5e9e84fb51ec5b2cb6b419b040b008276

am b0f2ded5: am 40db4a13: am 9ddb073b: am c70ce72a: am af9fde96: am 425addb9: am a43aaf00: resolved conflicts for merge of 9c00e673 to jb-mr1.1-dev

* commit 'b0f2ded5e9e84fb51ec5b2cb6b419b040b008276':
  Fix CalendarView to show the right labels. [DO NOT MERGE]

tools/layoutlib/create/src/com/android/tools/layoutlib/create/CreateInfo.java

diff --git a/tools/layoutlib/create/src/com/android/tools/layoutlib/create/CreateInfo.java b/tools/layoutlib/create/src/com/android/tools/layoutlib/create/CreateInfo.java
index 7b0f8f5..911df7d 100644
--- 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 @@
         "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",