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

Commit 16e17a77 authored by Diego Perez's avatar Diego Perez
Browse files

resolve merge conflicts of aa9c9fb2 to nyc-dev 

Change-Id: Id46238cb759f2d63a072cb7ea8a27c5fd8a6672e
parents bc163f07 aa9c9fb2

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

+4 −0
Original line number Diff line number Diff line
@@ -308,6 +308,10 @@ public final class CreateInfo implements ICreateInfo { 
            "java.nio.charset.Charsets",                       "java.nio.charset.StandardCharsets",

            "java.lang.IntegralToString",                      "com.android.tools.layoutlib.java.IntegralToString",

            "java.lang.UnsafeByteSequence",                    "com.android.tools.layoutlib.java.UnsafeByteSequence",

            // Use android.icu.text versions of DateFormat and SimpleDateFormat since the

            // original ones do not match the Android implementation

            "java.text.DateFormat",                            "android.icu.text.DateFormat",

            "java.text.SimpleDateFormat",                      "android.icu.text.SimpleDateFormat"

        };



    private final static String[] EXCLUDED_CLASSES =