Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 567f948b authored by Deepanshu Gupta's avatar Deepanshu Gupta Committed by Android Git Automerger
Browse files

am 872a5a1a: am 01fefec9: am 5fc8f945: am b0f2ded5: am 40db4a13: am 9ddb073b:... 

am 872a5a1a: am 01fefec9: am 5fc8f945: 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 '872a5a1a':
  Fix CalendarView to show the right labels. [DO NOT MERGE]
parents 4472b649 872a5a1a

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -136,6 +136,7 @@ public final class CreateInfo implements ICreateInfo { 
        "android.text.format.DateFormat#is24HourFormat",

        "android.text.format.DateFormat#is24HourFormat",

        "android.view.Choreographer#getRefreshRate",

        "android.view.Choreographer#getRefreshRate",

        "android.view.Display#updateDisplayInfoLocked",

        "android.view.Display#updateDisplayInfoLocked",

        "android.view.Display#getWindowManager",

        "android.view.LayoutInflater#rInflate",

        "android.view.LayoutInflater#rInflate",

        "android.view.LayoutInflater#parseInclude",

        "android.view.LayoutInflater#parseInclude",

        "android.view.View#isInEditMode",

        "android.view.View#isInEditMode",