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

Commit a43aaf00 authored by Deepanshu Gupta's avatar Deepanshu Gupta
Browse files

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

Change-Id: I4ab1b0a71b99692458efc3a67c8a8da3690afb7b
parents 888461c8 9c00e673

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",