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

The earlier resolution (a2a5ce49b2) wasn't the right one. This fixes it. Change-Id: I6a6dc908d3e7dd510064a46df932d129a58eed98
2015-01-06 14:58:37 -08:00
parent a2a5ce49b2
commit e88c120ebf
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",