resolved conflicts for merge of 8c831b2f to lmp-mr1-dev-plus-aosp

Change-Id: I8894287fd43afc863d070cab04cfaa1bf70f7ebb
2015-01-06 14:46:27 -08:00
parent 5760f1535b 8c831b2fc6
commit a2a5ce49b2
1 changed files with 1 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,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",