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

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

resolve conflict for 8c831b2f -> lmp-mr1-dev-plus-aosp again 

The earlier resolution (a2a5ce49)
wasn't the right one. This fixes it.

Change-Id: I6a6dc908d3e7dd510064a46df932d129a58eed98
parent a2a5ce49

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

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

        "android.text.AndroidBidi",

        "android.text.StaticLayout",

        "android.util.FloatMath",

        "android.view.Display",

        "libcore.icu.DateIntervalFormat",

        "libcore.icu.ICU",