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

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

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

* commit '425addb9':
  Fix CalendarView to show the right labels. [DO NOT MERGE]
parents 40b54563 425addb9

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

+1 −0
Original line number Diff line number Diff line
@@ -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",