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

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

am a2a5ce49: resolved conflicts for merge of 8c831b2f to lmp-mr1-dev-plus-aosp 

* commit 'a2a5ce49':
  Remove Time from CreateInfo
parents 148d8641 a2a5ce49

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

+1 −1
Original line number Diff line number Diff line
@@ -228,7 +228,7 @@ public final class CreateInfo implements ICreateInfo { 
        "android.os.SystemProperties",

        "android.text.AndroidBidi",

        "android.text.StaticLayout",

        "android.text.format.Time",

        "android.util.FloatMath",

        "android.view.Display",

        "libcore.icu.DateIntervalFormat",

        "libcore.icu.ICU",