commit 40db4a13bc8389dd94cac2fd4c896e10b46c2499
author Deepanshu Gupta <deepanshu@google.com> Tue May 13 17:35:00 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue May 13 17:35:00 2014 +0000
tree 1ce19922396c657ebbc4d4da545cfa976999429d
parent dff29f73612799506739c8ef83e1313461f37a4b
parent 9ddb073bf72d9ca587ecc626dcc9721dd33447c9

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

* commit '9ddb073bf72d9ca587ecc626dcc9721dd33447c9':
  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 baae172..f362254 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",