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

2015-01-06 23:00:37 +00:00
parent 641353b6c2 e88c120ebf
commit 27ce276332
1 changed files with 0 additions and 1 deletions
--- a/tools/layoutlib/create/src/com/android/tools/layoutlib/create/CreateInfo.java
+++ b/tools/layoutlib/create/src/com/android/tools/layoutlib/create/CreateInfo.java
@@ -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",