resolved conflicts for merge of 8c831b2f to lmp-mr1-dev-plus-aosp (a2a5ce49) · Commits · e / os / android_frameworks_base

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